feat(system): 更新租户模块字段类型与权限控制逻辑
- 将 SysTenant 和 SysTenantVo 中的 bearFeeFlag 字段类型由 Integer 改为 Boolean - 移除 SysTenant 中不再使用的 BigDecimal 导入 - 在 SysTenantController 的删除接口中调整 SaCheckRole 权限注解模式为 OR- 在 SysTenantExtendBo 中新增 bearFeeFlag 字段并更新 splitRatio 描述
This commit is contained in:
parent
eeb50d18b1
commit
0513fbff94
@ -180,7 +180,7 @@ public class SysTenantController extends BaseController {
|
||||
*/
|
||||
@Tag(name = "删除租户表")
|
||||
@Log(title = "租户表", businessType = BusinessType.DELETE)
|
||||
@SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY})
|
||||
@SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
|
||||
@SaCheckPermission("system:tenant:remove")
|
||||
@DeleteMapping("/remove")
|
||||
public R batchRemove(@RequestParam("ids") String ids) {
|
||||
|
@ -11,7 +11,6 @@ import lombok.EqualsAndHashCode;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@ -100,10 +99,8 @@ public class SysTenant extends BaseEntity {
|
||||
@Schema(description = "联系人手机号")
|
||||
private String contactPhone;
|
||||
|
||||
/**
|
||||
* 是否承担手续费
|
||||
*/
|
||||
private Integer bearFeeFlag;
|
||||
@Schema(description = "是否承担手续费")
|
||||
private Boolean bearFeeFlag;
|
||||
|
||||
|
||||
@Schema(description = "代理机构名称")
|
||||
|
@ -130,9 +130,12 @@ public class SysTenantExtendBo {
|
||||
@Schema(description = "签约日期")
|
||||
private LocalDateTime signDate;
|
||||
|
||||
@Schema(description = "分成比例")
|
||||
@Schema(description = "分成比例模板")
|
||||
private String splitRatio;
|
||||
|
||||
@Schema(description = "分账是否承担手续费")
|
||||
private Boolean bearFeeFlag;
|
||||
|
||||
@Schema(description = "签约人")
|
||||
private String signer;
|
||||
|
||||
|
@ -161,11 +161,8 @@ public class SysTenantVo implements Serializable {
|
||||
@Schema(description = "签约状态(0.待审核1.有效 2.无效 3.编辑 4.过期)")
|
||||
private String signStatus;
|
||||
|
||||
/**
|
||||
* 分账是否承担手续费
|
||||
*/
|
||||
@Schema(description = "分账是否承担手续费")
|
||||
private Integer bearFeeFlag;
|
||||
private Boolean bearFeeFlag;
|
||||
|
||||
/**
|
||||
* 创建部门
|
||||
|
Loading…
x
Reference in New Issue
Block a user