Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/entity/MonitorDataValueEntity.java

@@ -24,5 +24,5 @@ public class MonitorDataValueEntity implements Serializable {
     @ApiModelProperty("采集数据")
     private Double dataValue;
     @ApiModelProperty("采集数据单位")
-    private Double unit;
+    private String unit;
 }