1
0

2 Commity a128ec252e ... ee5fbb3c87

Autor SHA1 Správa Dátum
  liwei19941102 ee5fbb3c87 Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/iotc 2 rokov pred
  liwei19941102 8dffa69a42 修改 2 rokov pred

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/data/controller/MqttController.java

@@ -32,9 +32,7 @@ import java.util.List;
 @Slf4j
 @Slf4j
 public class MqttController {
 public class MqttController {
 
 
-
 //    private final ITblMqttService mqttService;
 //    private final ITblMqttService mqttService;
-
     private final MqttService mqttService;
     private final MqttService mqttService;
 
 
     @GetMapping("/createMqtt")
     @GetMapping("/createMqtt")

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRecordVo.java

@@ -26,14 +26,12 @@ public class TblRecordVo implements Serializable {
      */
      */
     @ExcelProperty(value = "")
     @ExcelProperty(value = "")
     private Long id;
     private Long id;
-
     /**
     /**
      *
      *
      */
      */
     @ExcelProperty(value = "")
     @ExcelProperty(value = "")
     private String json;
     private String json;
 
 
-
     /**
     /**
      *
      *
      */
      */

+ 4 - 4
ruoyi-ui-vue3/src/views/device/camera/add.vue

@@ -16,7 +16,7 @@
                         <el-descriptions-item>
                         <el-descriptions-item>
                             <template #label>
                             <template #label>
                                 <div style="display: inline-block;min-width: 100px;text-align: right">
                                 <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 设备名称
+                                     设备名称
                                 </div>
                                 </div>
 
 
                             </template>
                             </template>
@@ -27,7 +27,7 @@
                         <el-descriptions-item>
                         <el-descriptions-item>
                             <template #label>
                             <template #label>
                                 <div style="display: inline-block;min-width: 100px;text-align: right">
                                 <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 平台编码
+                                    平台编码
                                 </div>
                                 </div>
 
 
                             </template>
                             </template>
@@ -39,7 +39,7 @@
                         <el-descriptions-item>
                         <el-descriptions-item>
                             <template #label>
                             <template #label>
                                 <div style="display: inline-block;min-width: 100px;text-align: right">
                                 <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 主设备类型
+                                     主设备类型
                                 </div>
                                 </div>
 
 
                             </template>
                             </template>
@@ -51,7 +51,7 @@
                         <el-descriptions-item>
                         <el-descriptions-item>
                             <template #label>
                             <template #label>
                                 <div style="display: inline-block;min-width: 100px;text-align: right">
                                 <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 主设备协议类型
+                                     主设备协议类型
                                 </div>
                                 </div>
 
 
                             </template>
                             </template>