Compare commits
No commits in common. "f33323af446c201dc6ca15f17a6ba4682423de7b" and "01bdbbb102e70a09918a7012bbd79d59416f1a21" have entirely different histories.
f33323af44
...
01bdbbb102
@ -180,7 +180,7 @@ public class SysTenantController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@Tag(name = "删除租户表")
|
@Tag(name = "删除租户表")
|
||||||
@Log(title = "租户表", businessType = BusinessType.DELETE)
|
@Log(title = "租户表", businessType = BusinessType.DELETE)
|
||||||
@SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
|
@SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY})
|
||||||
@SaCheckPermission("system:tenant:remove")
|
@SaCheckPermission("system:tenant:remove")
|
||||||
@DeleteMapping("/remove")
|
@DeleteMapping("/remove")
|
||||||
public R batchRemove(@RequestParam("ids") String ids) {
|
public R batchRemove(@RequestParam("ids") String ids) {
|
||||||
|
@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
|
|||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -99,8 +100,10 @@ public class SysTenant extends BaseEntity {
|
|||||||
@Schema(description = "联系人手机号")
|
@Schema(description = "联系人手机号")
|
||||||
private String contactPhone;
|
private String contactPhone;
|
||||||
|
|
||||||
@Schema(description = "是否承担手续费")
|
/**
|
||||||
private Boolean bearFeeFlag;
|
* 是否承担手续费
|
||||||
|
*/
|
||||||
|
private Integer bearFeeFlag;
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "代理机构名称")
|
@Schema(description = "代理机构名称")
|
||||||
|
@ -130,12 +130,9 @@ public class SysTenantExtendBo {
|
|||||||
@Schema(description = "签约日期")
|
@Schema(description = "签约日期")
|
||||||
private LocalDateTime signDate;
|
private LocalDateTime signDate;
|
||||||
|
|
||||||
@Schema(description = "分成比例模板")
|
@Schema(description = "分成比例")
|
||||||
private String splitRatio;
|
private String splitRatio;
|
||||||
|
|
||||||
@Schema(description = "分账是否承担手续费")
|
|
||||||
private Boolean bearFeeFlag;
|
|
||||||
|
|
||||||
@Schema(description = "签约人")
|
@Schema(description = "签约人")
|
||||||
private String signer;
|
private String signer;
|
||||||
|
|
||||||
|
@ -161,8 +161,11 @@ public class SysTenantVo implements Serializable {
|
|||||||
@Schema(description = "签约状态(0.待审核1.有效 2.无效 3.编辑 4.过期)")
|
@Schema(description = "签约状态(0.待审核1.有效 2.无效 3.编辑 4.过期)")
|
||||||
private String signStatus;
|
private String signStatus;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分账是否承担手续费
|
||||||
|
*/
|
||||||
@Schema(description = "分账是否承担手续费")
|
@Schema(description = "分账是否承担手续费")
|
||||||
private Boolean bearFeeFlag;
|
private Integer bearFeeFlag;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建部门
|
* 创建部门
|
||||||
|
Loading…
x
Reference in New Issue
Block a user