Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17

YunaiV
2 parents d1242003 a08526d8
Showing 3 changed files with 6 additions and 3 deletions
yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java
@@ -123,6 +123,7 @@ export function useFormSchema(): VbenFormSchema[] {
   #elseif($column.htmlType == "inputNumber")## 数字输入框
       component: 'InputNumber',
       componentProps: {
+        class: '!w-full',
         min: 0,
         placeholder: '请输入${comment}',
       },
@@ -339,6 +340,7 @@ export function use${subSimpleClassName}FormSchema(): VbenFormSchema[] {
                             #elseif($column.htmlType == "inputNumber")## 数字输入框
                                 component: 'InputNumber',
                                 componentProps: {
+                                    class: '!w-full',
                                     min: 0,
                                     placeholder: '请输入${comment}',
                                 },
@@ -572,6 +574,7 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions&lt;${api
                                 #elseif($column.htmlType == "inputNumber")## 数字输入框
                                     component: 'InputNumber',
                                     componentProps: {
+                                        class: '!w-full',
                                         min: 0,
                                         placeholder: '请输入${comment}',
                                     },
@@ -613,4 +616,4 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions&lt;${api
     }
     #end
 #end
-#end
 \ No newline at end of file
+#end
@@ -17,7 +17,7 @@ public class IotAlertRecordPageReqVO extends PageParam {
     private Long configId;
     @Schema(description = "告警级别", example = "1")
-    private Integer level;
+    private Integer configLevel;
     @Schema(description = "产品编号", example = "2050")
     private Long productId;
@@ -22,7 +22,7 @@ public interface IotAlertRecordMapper extends BaseMapperX&lt;IotAlertRecordDO&gt; {
     default PageResult<IotAlertRecordDO> selectPage(IotAlertRecordPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotAlertRecordDO>()
                 .eqIfPresent(IotAlertRecordDO::getConfigId, reqVO.getConfigId())
-                .eqIfPresent(IotAlertRecordDO::getConfigLevel, reqVO.getLevel())
+                .eqIfPresent(IotAlertRecordDO::getConfigLevel, reqVO.getConfigLevel())
                 .eqIfPresent(IotAlertRecordDO::getProductId, reqVO.getProductId())
                 .eqIfPresent(IotAlertRecordDO::getDeviceId, reqVO.getDeviceId())
                 .eqIfPresent(IotAlertRecordDO::getProcessStatus, reqVO.getProcessStatus())