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

zc-business/src/main/java/com/zc/business/constant/DeviceFunctionIdConstants.java

@@ -15,7 +15,17 @@ public class DeviceFunctionIdConstants {
      */
     public static final String CAMERA = "51";
     /**
-     * 可变信息标志
+     * 可变信息标志 11 功能码
      */
-    public static final String VARIABLE_INFORMATION_FLAG = "1B";
+    public static final String VARIABLE_INFORMATION_FLAG_11 = "11";
+
+    /**
+     * 可变信息标志 13 功能码
+     */
+    public static final String VARIABLE_INFORMATION_FLAG_13 = "13";
+
+    /**
+     * 可变信息标志 1B 功能码
+     */
+    public static final String VARIABLE_INFORMATION_FLAG_1B = "1B";
 }

zc-business/src/main/java/com/zc/business/service/impl/DcYzsqbdcHmbldDataServiceImpl.java

@@ -110,7 +110,7 @@ public class DcYzsqbdcHmbldDataServiceImpl implements IDcYzsqbdcHmbldDataService
         data.setCreateTime(DateUtils.getNowDate());
         data.setZdcll(0);
         data.setZxkcjtl(0);
-        data.setMtcpjcs(0);
+        data.setZxkcpjcs(0);
         data.setXxhcjtl(0);
         data.setXxhcpjcs(0);
         data.setDkcjtl(0);