Commit 3b97b1b0a4ae3a92380cd2314cf7559eeefca3df
Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17
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
| ... | ... | @@ -123,6 +123,7 @@ export function useFormSchema(): VbenFormSchema[] { |
| 123 | 123 | #elseif($column.htmlType == "inputNumber")## 数字输入框 |
| 124 | 124 | component: 'InputNumber', |
| 125 | 125 | componentProps: { |
| 126 | + class: '!w-full', | |
| 126 | 127 | min: 0, |
| 127 | 128 | placeholder: '请输入${comment}', |
| 128 | 129 | }, |
| ... | ... | @@ -339,6 +340,7 @@ export function use${subSimpleClassName}FormSchema(): VbenFormSchema[] { |
| 339 | 340 | #elseif($column.htmlType == "inputNumber")## 数字输入框 |
| 340 | 341 | component: 'InputNumber', |
| 341 | 342 | componentProps: { |
| 343 | + class: '!w-full', | |
| 342 | 344 | min: 0, |
| 343 | 345 | placeholder: '请输入${comment}', |
| 344 | 346 | }, |
| ... | ... | @@ -572,6 +574,7 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${api |
| 572 | 574 | #elseif($column.htmlType == "inputNumber")## 数字输入框 |
| 573 | 575 | component: 'InputNumber', |
| 574 | 576 | componentProps: { |
| 577 | + class: '!w-full', | |
| 575 | 578 | min: 0, |
| 576 | 579 | placeholder: '请输入${comment}', |
| 577 | 580 | }, |
| ... | ... | @@ -613,4 +616,4 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${api |
| 613 | 616 | } |
| 614 | 617 | #end |
| 615 | 618 | #end |
| 616 | -#end | |
| 617 | 619 | \ No newline at end of file |
| 620 | +#end | ... | ... |
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 { |
| 17 | 17 | private Long configId; |
| 18 | 18 | |
| 19 | 19 | @Schema(description = "告警级别", example = "1") |
| 20 | - private Integer level; | |
| 20 | + private Integer configLevel; | |
| 21 | 21 | |
| 22 | 22 | @Schema(description = "产品编号", example = "2050") |
| 23 | 23 | private Long productId; | ... | ... |
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<IotAlertRecordDO> { |
| 22 | 22 | default PageResult<IotAlertRecordDO> selectPage(IotAlertRecordPageReqVO reqVO) { |
| 23 | 23 | return selectPage(reqVO, new LambdaQueryWrapperX<IotAlertRecordDO>() |
| 24 | 24 | .eqIfPresent(IotAlertRecordDO::getConfigId, reqVO.getConfigId()) |
| 25 | - .eqIfPresent(IotAlertRecordDO::getConfigLevel, reqVO.getLevel()) | |
| 25 | + .eqIfPresent(IotAlertRecordDO::getConfigLevel, reqVO.getConfigLevel()) | |
| 26 | 26 | .eqIfPresent(IotAlertRecordDO::getProductId, reqVO.getProductId()) |
| 27 | 27 | .eqIfPresent(IotAlertRecordDO::getDeviceId, reqVO.getDeviceId()) |
| 28 | 28 | .eqIfPresent(IotAlertRecordDO::getProcessStatus, reqVO.getProcessStatus()) | ... | ... |