diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenPageReqVO.java index 19f9ea32..66f2001c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenPageReqVO.java @@ -37,9 +37,6 @@ public class CarteenPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "预留关联角色id", example = "27706") - private Integer roloId; - @Schema(description = "编码") private String serialNumber; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenRespVO.java index d4d0b11c..6d29c745 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenRespVO.java @@ -45,10 +45,6 @@ public class CarteenRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @Schema(description = "预留关联角色id", example = "27706") - @ExcelProperty("预留关联角色id") - private Integer roloId; - @Schema(description = "编码", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("编码") private String serialNumber; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenSaveReqVO.java index abdebe45..70a0424d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenSaveReqVO.java @@ -36,9 +36,6 @@ public class CarteenSaveReqVO { @NotEmpty(message = "联系电话不能为空") private String phone; - @Schema(description = "预留关联角色id", example = "27706") - private Integer roloId; - @Schema(description = "编码", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "编码不能为空") private String serialNumber; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/carteen/CarteenDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/carteen/CarteenDO.java index 0b551080..9eee2f26 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/carteen/CarteenDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/carteen/CarteenDO.java @@ -52,9 +52,9 @@ public class CarteenDO extends BaseDO { */ private String phone; /** - * 预留关联角色id + * 租户编号 */ - private Integer roloId; + private Long tenantId; /** * 编码 */ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/carteen/CarteenMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/carteen/CarteenMapper.java index 2f8dc3ce..19999bea 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/carteen/CarteenMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/carteen/CarteenMapper.java @@ -26,7 +26,6 @@ public interface CarteenMapper extends BaseMapperX { .eqIfPresent(CarteenDO::getStoreAddress, reqVO.getStoreAddress()) .eqIfPresent(CarteenDO::getPhone, reqVO.getPhone()) .betweenIfPresent(CarteenDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(CarteenDO::getRoloId, reqVO.getRoloId()) .eqIfPresent(CarteenDO::getSerialNumber, reqVO.getSerialNumber()) .orderByDesc(CarteenDO::getId)); }