Merge remote-tracking branch 'origin/master'

beidou-ship/pom.xml

@@ -43,6 +43,12 @@
             <version>5.8.5</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.5</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/warning/model/domain/WarningParamDictData.java

@@ -16,7 +16,7 @@ public class WarningParamDictData {
     @ApiModelProperty("参数名称")
     private String paramName;
     @ApiModelProperty("参数单位")
-    private String unit;
+    private String paramUnit;
     private String delFlag;
 
 }

beidou-ship/src/main/resources/mapper/ShipWarningModelMapper.xml

@@ -311,7 +311,7 @@
     </insert>
 
     <select id="selectParamDict" resultType="warningParamDictData">
-        select id,param_code as paramCode,param_name as paramName from ax_beidou_warning_param_dict where del_flag = '0'
+        select id,param_code as paramCode,param_name as paramName,unit as paramUnit from ax_beidou_warning_param_dict where del_flag = '0'
     </select>
 
     <select id="selectAreaList" resultType="warningAreaVo">