From aef8b1b4f890c88f361a65fe062852a71499dc37 Mon Sep 17 00:00:00 2001 From: chenqp <965586934@qq.com> Date: Mon, 7 Aug 2023 22:04:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A2=84=E7=AE=97=EF=BC=8C=E8=B4=B9?= =?UTF-8?q?=E6=8E=A7=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bs/controller/admin/feemanage/vo/FeeManageBaseVO.java | 4 +++- .../yudao/module/bs/dal/dataobject/budget/BudgetDO.java | 2 ++ .../module/bs/dal/dataobject/feemanage/FeeManageDO.java | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/feemanage/vo/FeeManageBaseVO.java b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/feemanage/vo/FeeManageBaseVO.java index 2385950d..1a95630d 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/feemanage/vo/FeeManageBaseVO.java +++ b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/feemanage/vo/FeeManageBaseVO.java @@ -22,7 +22,9 @@ public class FeeManageBaseVO { @Schema(description = "角色", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "角色不能为空") private Set roleIds; - + @Schema(description = "费用类型", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "费用类型不能为空") + private String feeType; @Schema(description = "限定金额", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "限定金额不能为空") private BigDecimal amount; diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/budget/BudgetDO.java b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/budget/BudgetDO.java index ec54413f..6dea76e2 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/budget/BudgetDO.java +++ b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/budget/BudgetDO.java @@ -67,4 +67,6 @@ public class BudgetDO extends BaseDO { @TableField(typeHandler = JacksonTypeHandler.class) private List files; + @TableField(exist = false) + private Boolean deleted; } diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/feemanage/FeeManageDO.java b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/feemanage/FeeManageDO.java index 778fc656..492e96f1 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/feemanage/FeeManageDO.java +++ b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/feemanage/FeeManageDO.java @@ -61,5 +61,11 @@ public class FeeManageDO extends BaseDO { */ @TableField(typeHandler = JacksonTypeHandler.class) private List files; + /** + * 费用类型 + */ + private String feeType; + @TableField(exist = false) + private Boolean deleted; }