From 81c165224aea17d1696c13fe8505db1de403f515 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 5 Jan 2023 11:01:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=AF=E6=8A=95=E6=94=BE?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=9D=BF=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsSupplierController.java | 9 +- .../serve/modules/bms/entity/BmsSupplier.java | 8 ++ .../modules/his/entity/HisUserSupplier.java | 3 + .../TbsActivityTemplateController.java | 21 ++++ .../TbsActivityTemplateLogController.java | 92 +++++++++++++++ .../tbs/entity/TbsActivityTemplateLog.java | 106 ++++++++++++++++++ .../entity/so/TbsActivityTemplateLogSo.java | 36 ++++++ .../mapper/TbsActivityTemplateLogMapper.java | 14 +++ .../TbsActivityTemplateLogService.java | 23 ++++ .../TbsActivityTemplateLogServiceImpl.java | 33 ++++++ .../impl/TbsActivityTemplateServiceImpl.java | 7 ++ .../mapper/bms/BmsChannelPointMapper.xml | 2 + .../mapper/bms/BmsSupplierMapper.xml | 2 + .../resources/mapper/goods/GoodsSkuMapper.xml | 2 + .../resources/mapper/goods/GoodsSpuMapper.xml | 2 + 15 files changed, 356 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java create mode 100644 src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java create mode 100644 src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateLogSo.java create mode 100644 src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityTemplateLogMapper.java create mode 100644 src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateLogService.java create mode 100644 src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 9deeedc0..9396d9e2 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.bms.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.pagehelper.PageHelper; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -81,21 +82,21 @@ public class BmsSupplierController { * @param param * @return */ - @GetMapping("/page") + @PostMapping("/page") @PreAuthorize("hasRole('bms:supplier:query')") - public R> getPage(BmsSupplier param){ + public R> getPage(@RequestBody BmsSupplier param){ if(param.getLoadByCurrent()!=null&¶m.getLoadByCurrent().equals(1)){ String userId = AuthContextUtils.getSysUserId(); //初始化 hisUserSupplierService.initByUserId(userId,false); HisUserSupplier userSupplier = param.toHisUserSupplier(userId,null); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(userSupplier); - PageUtil.startPage(); + PageHelper.startPage(param.getPageNum(),param.getPageSize()); List list = hisUserSupplierService.list(lqw); List supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList()); return R.byPageHelperList(list,supplierList); } - PageUtil.startPage(); + PageHelper.startPage(param.getPageNum(),param.getPageSize()); List list = bmsSupplierService.selectSupplierList(param); initSupplierList(list); initParentList(list); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index 5cb6d2a2..6c5c42a1 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -228,6 +228,13 @@ public class BmsSupplier implements Serializable { @TableField(exist = false) private Object region2FourthlyInfo; + /** 翻页参数 */ + @TableField(exist = false) + private Integer pageNum; + + /** 翻页参数2 */ + @TableField(exist = false) + private Integer pageSize; public HisUserSupplier toHisUserSupplier(String userId,Integer type){ HisUserSupplier userSupplier = new HisUserSupplier(); @@ -249,6 +256,7 @@ public class BmsSupplier implements Serializable { userSupplier.setBizRegionThird(this.getRegion2Third()); userSupplier.setBizRegionFourthly(this.getRegion2Fourthly()); userSupplier.setType(type); + userSupplier.setCostFlag(this.costFlag); return userSupplier; } diff --git a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java index 3c3a9880..19857c5d 100644 --- a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java +++ b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java @@ -98,6 +98,8 @@ public class HisUserSupplier implements Serializable { @Length(max = 32,message = "行政区域4长度不能超过32字") private String bizRegionFourthly; + private Integer costFlag; + public BmsSupplier toSupplier(){ BmsSupplier bmsSupplier = new BmsSupplier(); bmsSupplier.setId(this.getSupplierId()+""); @@ -111,6 +113,7 @@ public class HisUserSupplier implements Serializable { bmsSupplier.setRegion2Second(this.getBizRegionSecond()); bmsSupplier.setRegion2Third(this.getBizRegionThird()); bmsSupplier.setRegionFourthly(this.getBizRegionFourthly()); + bmsSupplier.setCostFlag(this.costFlag); return bmsSupplier; } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java index 28150b14..2d2499a0 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java @@ -9,7 +9,9 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.*; import com.qs.serve.modules.bms.entity.BmsRegionUser; import com.qs.serve.modules.bms.service.BmsRegionUserService; +import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog; import com.qs.serve.modules.tbs.entity.TbsActivityTemplateRegion; +import com.qs.serve.modules.tbs.service.TbsActivityTemplateLogService; import com.qs.serve.modules.tbs.service.TbsActivityTemplateRegionService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -40,6 +42,7 @@ public class TbsActivityTemplateController { private TbsActivityTemplateService tbsActivityTemplateService; private TbsActivityTemplateRegionService tbsActivityTemplateRegionService; private BmsRegionUserService bmsRegionUserService; + private final TbsActivityTemplateLogService activityTemplateLogService; /** * 列表 @@ -125,6 +128,11 @@ public class TbsActivityTemplateController { template.setId(param.getId()); template.setTemplateState(param.getTemplateState()); tbsActivityTemplateService.updateById(template); + TbsActivityTemplate tmp = tbsActivityTemplateService.getById(param.getId()); + if(tmp!=null){ + TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(template,param.getTemplateState()); + activityTemplateLogService.save(templateLog); + } return R.ok(template); } @@ -154,6 +162,19 @@ public class TbsActivityTemplateController { @PreAuthorize("hasRole('tbs:activityTemplate:delete')") public R deleteById(@PathVariable("ids") String ids){ List idsLong = StringUtils.splitIdLong(ids); + //校验是否可删除 + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.in(TbsActivityTemplateRegion::getTemplateId,idsLong); + if(tbsActivityTemplateRegionService.count(lqw)>0){ + return R.error("部分模板被使用无法删除"); + } + List tmps = tbsActivityTemplateService.listByIds(idsLong); + if(CollectionUtil.isNotEmpty(tmps)){ + for (TbsActivityTemplate template : tmps) { + TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(template,2); + activityTemplateLogService.save(templateLog); + } + } boolean result = tbsActivityTemplateService.removeByIds(idsLong); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java new file mode 100644 index 00000000..79a2d05a --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java @@ -0,0 +1,92 @@ +package com.qs.serve.modules.tbs.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.StringUtils; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import com.qs.serve.modules.tbs.entity.so.TbsActivityTemplateLogSo; +import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog; +import com.qs.serve.modules.tbs.service.TbsActivityTemplateLogService; + +import javax.validation.Valid; +import java.util.List; + +/** + * 预算 活动模板日志 + * @author YenHex + * @since 2023-01-05 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("tbs/activityTemplateLog") +public class TbsActivityTemplateLogController { + + private TbsActivityTemplateLogService tbsActivityTemplateLogService; + + /** + * 列表 + * @param param + * @return + */ + //@GetMapping("/list") + @PreAuthorize("hasRole('tbs:activityTemplateLog:query')") + public R> getList(TbsActivityTemplateLogSo param){ + TbsActivityTemplateLog entity = CopierUtil.copy(param,new TbsActivityTemplateLog()); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); + PageUtil.startPage(); + List list = tbsActivityTemplateLogService.list(lqw); + return R.ok(list); + } + + /** + * 翻页 + * @param param + * @return + */ + @GetMapping("/page") + public R> getPage(TbsActivityTemplateLogSo param){ + TbsActivityTemplateLog entity = CopierUtil.copy(param,new TbsActivityTemplateLog()); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); + PageUtil.startPage(); + List list = tbsActivityTemplateLogService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * ID查询 + * @param id + * @return + */ + @GetMapping("/getById/{id}") + @SysLog(module = SystemModule.Budget, title = "活动模板", biz = BizType.QUERY) + public R getById(@PathVariable("id") String id){ + TbsActivityTemplateLog tbsActivityTemplateLog = tbsActivityTemplateLogService.getById(id); + return R.ok(tbsActivityTemplateLog); + } + + /** + * 删除 + * @param ids + * @return + */ + @DeleteMapping("/deleteById/{ids}") + @SysLog(module = SystemModule.Budget, title = "活动模板", biz = BizType.DELETE) + public R deleteById(@PathVariable("ids") String ids){ + List idsLong = StringUtils.splitIdLong(ids); + boolean result = tbsActivityTemplateLogService.removeByIds(idsLong); + return R.isTrue(result); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java new file mode 100644 index 00000000..bb02f1a9 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java @@ -0,0 +1,106 @@ +package com.qs.serve.modules.tbs.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 活动模板 实体类 + * @author YenHex + * @since 2023-01-05 + */ +@Data +@TableName("tbs_activity_template_log") +public class TbsActivityTemplateLog implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 模板id */ + @NotNull(message = "模板id不能为空") + private Long templateId; + + /** 模板名称 */ + @NotBlank(message = "模板名称不能为空") + @Length(max = 30,message = "模板名称长度不能超过30字") + private String templateName; + + /** 操作状态：0：关闭；1-开启；2-删除；3-修改 */ + private Integer optionState; + + /** 模板值 */ + @NotBlank(message = "模板值不能为空") + @Length(max = 6000,message = "模板值长度不能超过6000字") + private String templateValue; + + /** 销售区域标识：0-全部可见；1-部分可见；2-全部不可见 */ + @NotNull(message = "销售区域标识：0-全部可见；1-部分可见；2-全部不可见不能为空") + private Integer saleRegionFlag; + + /** 行政区域标识：0-全部可见；1-部分可见；2-全部不可 */ + @NotNull(message = "行政区域标识：0-全部可见；1-部分可见；2-全部不可不能为空") + private Integer bizRegionFlag; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 开始时间 */ + @Length(max = 0,message = "开始时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime startTime; + + /** 结束时间 */ + @Length(max = 0,message = "结束时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime endTime; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 租户id */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateLogSo.java b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateLogSo.java new file mode 100644 index 00000000..790dd1cd --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateLogSo.java @@ -0,0 +1,36 @@ +package com.qs.serve.modules.tbs.entity.so; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 活动模板 查询参数 + * @author YenHex + * @since 2023-01-05 + */ +@Data +public class TbsActivityTemplateLogSo implements Serializable { + + /** 模板id */ + private Long templateId; + + /** 模板名称 */ + private String templateName; + + /** 操作状态：0：关闭；1-开启；2-删除；3-修改 */ + private Integer optionState; + +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityTemplateLogMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityTemplateLogMapper.java new file mode 100644 index 00000000..6a062434 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityTemplateLogMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.tbs.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog; + +/** + * 活动模板 Mapper + * @author YenHex + * @date 2023-01-05 + */ +public interface TbsActivityTemplateLogMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateLogService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateLogService.java new file mode 100644 index 00000000..d5f6adca --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateLogService.java @@ -0,0 +1,23 @@ +package com.qs.serve.modules.tbs.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.tbs.entity.TbsActivityTemplate; +import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog; + +/** + * 活动模板 服务接口 + * @author YenHex + * @date 2023-01-05 + */ +public interface TbsActivityTemplateLogService extends IService { + + /** + * 模板转换成模板日志对象 + * @param template + * @param optState + * @return + */ + TbsActivityTemplateLog toLog(TbsActivityTemplate template,Integer optState); + +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java new file mode 100644 index 00000000..a037fe0e --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java @@ -0,0 +1,33 @@ +package com.qs.serve.modules.tbs.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.modules.tbs.entity.TbsActivityTemplate; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog; +import com.qs.serve.modules.tbs.service.TbsActivityTemplateLogService; +import com.qs.serve.modules.tbs.mapper.TbsActivityTemplateLogMapper; + +/** + * 活动模板 服务实现类 + * @author YenHex + * @since 2023-01-05 + */ +@Slf4j +@Service +@AllArgsConstructor +public class TbsActivityTemplateLogServiceImpl extends ServiceImpl implements TbsActivityTemplateLogService { + + + @Override + public TbsActivityTemplateLog toLog(TbsActivityTemplate template, Integer optState) { + if(template==null){return null;} + TbsActivityTemplateLog templateLog = CopierUtil.copy(template,new TbsActivityTemplateLog()); + templateLog.setTemplateId(template.getId()); + templateLog.setOptionState(optState); + return templateLog; + } +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java index b8dd7759..59741eec 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java @@ -8,8 +8,10 @@ import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.service.BmsRegion2Service; import com.qs.serve.modules.bms.service.BmsRegionService; +import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog; import com.qs.serve.modules.tbs.entity.TbsActivityTemplateRegion; import com.qs.serve.modules.tbs.entity.bo.TbsActivityTemplateBo; +import com.qs.serve.modules.tbs.service.TbsActivityTemplateLogService; import com.qs.serve.modules.tbs.service.TbsActivityTemplateRegionService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -35,11 +37,16 @@ public class TbsActivityTemplateServiceImpl extends ServiceImpl rmRegion = new LambdaQueryWrapper<>(); diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml index d2734c52..54e97806 100644 --- a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml @@ -28,6 +28,7 @@ + @@ -52,6 +53,7 @@ bms_channel_point.`update_time`, bms_channel_point.`tenant_id`, bms_channel_point.`del_flag`, + bms_channel_point.`cost_flag`, bms_channel_point.`create_by`, bms_channel_point.`update_by` diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml index d82ca3c9..747afea3 100644 --- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml @@ -34,6 +34,7 @@ + @@ -66,6 +67,7 @@ bms_supplier.`update_time`, bms_supplier.`update_by`, bms_supplier.`tenant_id`, + bms_supplier.`cost_flag`, bms_supplier.`del_flag` diff --git a/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/src/main/resources/mapper/goods/GoodsSpuMapper.xml index 701411c3..a22b0159 100644 --- a/src/main/resources/mapper/goods/GoodsSpuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSpuMapper.xml @@ -23,6 +23,7 @@ + @@ -48,6 +49,7 @@ goods_spu.`create_by`, goods_spu.`update_by`, goods_spu.`tenant_id`, + goods_spu.`cost_flag`, goods_spu.`del_flag`