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

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/TzsUserInfo.java

@@ -117,4 +117,9 @@ public class TzsUserInfo extends BaseEntity {
      */
     @TableField("amos_user_id")
     private String amosUserId;
+    /**
+     * 二维码状态0异常1正常
+     */
+    @TableField("qr_code_state")
+    private String qrCodeState;
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/entity/TzsUserInfo.java

@@ -117,4 +117,9 @@ public class TzsUserInfo extends BaseEntity {
      */
     @TableField("amos_user_id")
     private String amosUserId;
+    /**
+     * 二维码状态0异常1正常
+     */
+    @TableField("qr_code_state")
+    private String qrCodeState;
 }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/entity/TzsUserInfo.java

@@ -117,4 +117,9 @@ public class TzsUserInfo extends BaseEntity {
      */
     @TableField("amos_user_id")
     private String amosUserId;
+    /**
+     * 二维码状态0异常1正常
+     */
+    @TableField("qr_code_state")
+    private String qrCodeState;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

@@ -3,12 +3,12 @@
     {
       "dictDataKey": "0",
       "dictDataValue": "按设备种类",
-      "dictDataDesc": "upload/tzs/common/image/按照设备种类选择.png"
+      "dictDataDesc": "upload/tzs/common/image/业务场景-设备.png"
     },
     {
       "dictDataKey": "1",
       "dictDataValue": "按应用场景",
-      "dictDataDesc": "upload/tzs/common/image/按照应用场景选择.png"
+      "dictDataDesc": "upload/tzs/common/image/业务场景-应用.png"
     }
   ],
   "SGGZ": [

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/entity/TzsUserInfo.java

@@ -195,4 +195,10 @@ public class TzsUserInfo extends BaseEntity {
     @TableField(value = "job_title")
     private String jobTitle;
 
+    /**
+     * 二维码状态0异常1正常
+     */
+    @TableField("qr_code_state")
+    private String qrCodeState;
+
 }