Merge branch 'liutao_branch'

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepointrecord/vo/RecipePointRecordPageReqVO.java

@@ -32,7 +32,7 @@ public class RecipePointRecordPageReqVO extends PageParam {
     private String dataType;
 
     @Schema(description = "单位")
-    private String dataUnit;
+    private Integer dataUnit;
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepointrecord/vo/RecipePointRecordRespVO.java

@@ -39,7 +39,7 @@ public class RecipePointRecordRespVO {
 
     @Schema(description = "单位")
     @ExcelProperty("单位")
-    private String dataUnit;
+    private Integer dataUnit;
 
     @Schema(description = "备注", example = "你说的对")
     @ExcelProperty("备注")

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepointrecord/vo/RecipePointRecordSaveReqVO.java

@@ -29,7 +29,7 @@ public class RecipePointRecordSaveReqVO {
     private String dataType;
 
     @Schema(description = "单位")
-    private String dataUnit;
+    private Integer dataUnit;
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/recipepointrecord/RecipePointRecordDO.java

@@ -53,7 +53,7 @@ public class RecipePointRecordDO extends BaseDO {
     /**
      * 单位
      */
-    private String dataUnit;
+    private Integer dataUnit;
     /**
      * 备注
      */