diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm index 24eba2321b..f1917cec18 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm @@ -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<${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<${api } #end #end -#end \ No newline at end of file +#end diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java index 109f240917..b4039aa8ec 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java @@ -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; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java index f23fe60f74..0c8a4e4549 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java @@ -22,7 +22,7 @@ public interface IotAlertRecordMapper extends BaseMapperX { default PageResult selectPage(IotAlertRecordPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .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())