Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

gongchunyi

昨天 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 ruoyi-common/src/main/java/com/ruoyi/common/utils/api/MesApiUtils.java

@@ -15,13 +15,13 @@
@Component
public class MesApiUtils {

    @Value("${mes.ztzb.ip}")
    @Value("${mes.ztns.ip}")
    String ip;

    @Value("${mes.ztzb.user}")
    @Value("${mes.ztns.user}")
    String user;

    @Value("${mes.ztzb.password}")
    @Value("${mes.ztns.password}")
    String password;

    /**