Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicecategorytemplateattrs/vo/IotDeviceCategoryTemplateAttrsRespVO.java

@@ -7,7 +7,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 @Schema(description = "管理后台 - 设备分类公共模板属性 Response VO")
 @Data

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicecategorytemplateattrs/vo/IotDeviceCategoryTemplateAttrsSaveReqVO.java

@@ -1,8 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplateattrs.vo;
 
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.model.DeviceTemplateAttrs;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.Valid;
+
 @Schema(description = "管理后台 - 设备分类公共模板属性新增/修改 Request VO")
 @Data
 public class IotDeviceCategoryTemplateAttrsSaveReqVO {
@@ -47,7 +50,8 @@ public class IotDeviceCategoryTemplateAttrsSaveReqVO {
     private Integer sort;
 
     @Schema(description = "下拉框选项")
-    private String selectOptions;
+    @Valid
+    private DeviceTemplateAttrs selectOptions;
 
     @Schema(description = "属性版本号")
     private Integer version;