From a563cc4d5713b484ec99975ffc398713acb5a3de Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 5 Mar 2025 00:07:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventoryDetailQueryDTO.java | 2 +- .../supermarket/entity/SmSpuEntity.java | 3 ++ .../InventoryRecordPageVo.java | 36 ++----------------- .../pjcloud-supermarket-biz/pom.xml | 5 +++ .../SmErpInventoryRecordsController.java | 34 ++++++++++++------ .../controller/SmSpuController.java | 10 ++++++ .../mapper/SmErpInventoryRecordsMapper.java | 2 +- .../service/SmErpInventoryRecordsService.java | 16 +++++++++ .../SmErpInventoryRecordsServiceImpl.java | 14 +++++++- .../service/impl/SmSpuServiceImpl.java | 5 +++ .../mapper/SmErpInventoryRecordsMapper.xml | 12 +++++-- 11 files changed, 89 insertions(+), 50 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryDetailQueryDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryDetailQueryDTO.java index d21074074..860a1b686 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryDetailQueryDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryDetailQueryDTO.java @@ -21,7 +21,7 @@ public class InventoryDetailQueryDTO { * 单据日期 */ @Schema(description="单据日期") - private LocalDate ddDate; + private LocalDate inventoryDate; @Schema(description="1入库 2出库") private Integer orderType; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmSpuEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmSpuEntity.java index d4db41d31..6bddac4c5 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmSpuEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmSpuEntity.java @@ -120,4 +120,7 @@ public class SmSpuEntity extends Model { */ @Schema(description="租户编号") private Long tenantId; + + @Schema(description="商户id") + private Long merchantId; } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordPageVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordPageVo.java index 4550ac56b..78b144703 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordPageVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordPageVo.java @@ -39,19 +39,13 @@ public class InventoryRecordPageVo { @Schema(description="供应商id") - private Long supplierId; + private Long supplierName; /** * 备注 */ @Schema(description="备注") private String remark; - /** - * 创建人 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="创建人") - private String createBy; /** * 创建时间 @@ -60,33 +54,16 @@ public class InventoryRecordPageVo { @Schema(description="创建时间") private LocalDateTime createTime; - /** - * 审批状态 - */ - @Schema(description="审批状态") - private String checkStatus; - - - @Schema(description="关联码") - private String linkCode; - - - /** - * 库存商品id - */ - @Schema(description="库存商品id") - private Long erpSpuId; - /** * 数量 */ - @Schema(description="数量") + @Schema(description="入库数量") private Integer quantity; /** * 进价 */ - @Schema(description="进价") + @Schema(description="入库单价") @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer unitPrice; @@ -125,11 +102,4 @@ public class InventoryRecordPageVo { @Schema(description="装数") private Integer packageNum; - /** - * 进价（分为单位） - */ - @Schema(description="进价（分为单位）") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 - private Integer purchasePrice; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml index 5601eb20a..005039908 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml @@ -64,6 +64,11 @@ pjcloud-supermarket-api 5.7.0 + + com.bsd + pjcloud-wallet-api + 5.7.0 + com.bsd diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java index 05db2d333..7cb23af11 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java @@ -257,17 +257,29 @@ public class SmErpInventoryRecordsController { * @return */ @Operation(summary = "分页获取出入库明细" , description = "出库明细，入库明细" ) - @GetMapping("/inventoryDetail/page" ) - public R getInventoryDetailPage(@ParameterObject Page page, @ParameterObject InventoryDetailQueryDTO inventoryDetailQueryDTO) { - - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - if (StringUtils.isNotBlank(inventoryDetailQueryDTO.getKey())){ - wrapper.like(SmErpInventoryRecordsEntity::getProductName,inventoryDetailQueryDTO.getKey()); - } - wrapper.eq(Objects.nonNull(inventoryDetailQueryDTO.getDdDate()),SmErpInventoryRecordsEntity::getInventoryDate,inventoryDetailQueryDTO.getDdDate()); - wrapper.eq(SmErpInventoryRecordsEntity::getOrderType,inventoryDetailQueryDTO.getOrderType()); - //todo 审核成功条件 -// wrapper.eq(SmErpCgPlanEntity::getCheckStatus,); + @GetMapping("/inventoryType/page" ) + public R getinventoryTypePage(@ParameterObject Page page, @ParameterObject InventoryDetailQueryDTO inventoryDetailQueryDTO) { return R.ok(smErpInventoryRecordsService.getInventoryDetailPage(page, inventoryDetailQueryDTO)); } + /** + * + *根据单号获取明细 + * @return + */ + @Operation(summary = "分页获取出入库明细" , description = "出库明细，入库明细" ) + @GetMapping("/inventoryDetail" ) + public R getInventoryDetailByInventoryCode(@RequestParam("id")String inventoryCode) { + return R.ok(smErpInventoryRecordsService.getInventoryDetailByInventoryCode(inventoryCode)); + } + + /** + * 分页查询 + * @param page 分页对象 + * @return + */ + @Operation(summary = "分页获取出入库汇总" , description = "出库汇总，入库汇总" ) + @GetMapping("/inventoryTypeSum/page" ) + public R getInventoryTypeSumPage(@ParameterObject Page page, @ParameterObject InventoryDetailQueryDTO inventoryDetailQueryDTO) { + return R.ok(smErpInventoryRecordsService.getInventoryTypeSumPage(page, inventoryDetailQueryDTO)); + } } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java index b87518a28..6e36716a3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java @@ -9,12 +9,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper; import com.bsd.pjcloud.supermarket.service.SmErpSpuService; import com.bsd.pjcloud.supermarket.service.SmSpuService; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmSpuEditVo; +import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; +import com.bsd.pjcloud.wallet.api.vo.MchManageVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -45,6 +48,7 @@ public class SmSpuController { private final SmErpSpuService smErpSpuService; + private final RemoteMchService remoteMchService; /** * 分页查询 * @param page 分页对象 @@ -86,6 +90,12 @@ public class SmSpuController { @PostMapping @PreAuthorize("@pms.hasPermission('supermarket_smSpu_add')" ) public R save(@RequestBody SmSpuEntity smSpu) { + Long deptId = SecurityUtils.getUser().getDeptId(); + //查询商户，设置商户id + R byDeptId = remoteMchService.getByDeptId(deptId); + Long mearchantId= byDeptId.getData().getId(); + smSpu.setDeptId(deptId); + smSpu.setMerchantId(mearchantId); return R.ok(smSpuService.save(smSpu)); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpInventoryRecordsMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpInventoryRecordsMapper.java index 4146f1999..16063edf8 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpInventoryRecordsMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpInventoryRecordsMapper.java @@ -20,5 +20,5 @@ public interface SmErpInventoryRecordsMapper extends PjcloudBaseMapper getInventoryDetailPageByScope(@Param("inventoryDetailQueryDTO") InventoryDetailQueryDTO inventoryDetailQueryDTO, DataScope of); + Page getInventoryDetailPageByScope(Page page,@Param("inventoryDetailQueryDTO") InventoryDetailQueryDTO inventoryDetailQueryDTO, DataScope of); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpInventoryRecordsService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpInventoryRecordsService.java index ec593cb1c..e1f28b8a7 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpInventoryRecordsService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpInventoryRecordsService.java @@ -42,4 +42,20 @@ public interface SmErpInventoryRecordsService extends IService cgPlanItemEntities = BeanUtils.toBean(items, SmErpInventoryRecordsItemEntity.class); +// int sum1 = cgPlanItemEntities.stream().mapToInt(SmErpInventoryRecordsItemEntity::getTotalAmount).sum(); + List updateStockDTOS = new ArrayList<>(); for (SmErpInventoryRecordsItemEntity cgPlanItemEntity : cgPlanItemEntities) { cgPlanItemEntity.setInventoryId(smErpCgDdEntity.getId()); @@ -234,10 +236,20 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl pagedata=baseMapper.getInventoryDetailPageByScope(inventoryDetailQueryDTO, DataScope.of()); + Page pagedata=baseMapper.getInventoryDetailPageByScope(page,inventoryDetailQueryDTO, DataScope.of()); return pagedata; } + @Override + public Object getInventoryDetailByInventoryCode(String inventoryCode) { + return null; + } + + @Override + public Object getInventoryTypeSumPage(Page page, InventoryDetailQueryDTO inventoryDetailQueryDTO) { + return null; + } + } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java index e463313af..6ee833b76 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmSpuEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper; @@ -13,6 +15,8 @@ import com.bsd.pjcloud.supermarket.mapper.SmSpuMapper; import com.bsd.pjcloud.supermarket.service.SmSpuService; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; +import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; +import com.bsd.pjcloud.wallet.api.vo.MchManageVo; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -32,6 +36,7 @@ public class SmSpuServiceImpl extends ServiceImpl impl private final SmErpSpuMapper smErpSpuMapper; private final SmErpUnitMapper smErpUnitMapper; + @Override public Object pageScope(Page page, SmSpuEntity smSpu) { IPage pageData = baseMapper.selectSmErpPageScopeVo(page,smSpu, DataScope.of()); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsMapper.xml index 7ca921ae2..9d00a4195 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsMapper.xml @@ -29,8 +29,14 @@ \ No newline at end of file From 61de32bf9f011926234c4636c6688f3065528453 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 5 Mar 2025 14:18:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/entity/SmErpSpuEntity.java | 12 ++++++------ .../supermarket/entity/SmErpUnitEntity.java | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java index 909738c1b..c8818225b 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java @@ -107,8 +107,8 @@ public class SmErpSpuEntity extends Model { * 成本单价，单位： 分 */ @Schema(description="成本单价，单位： 分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer costPrice; /** @@ -158,16 +158,16 @@ public class SmErpSpuEntity extends Model { * 进价（分为单位） */ @Schema(description="进价（分为单位）") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer purchasePrice; /** * 零售价（分为单位） */ @Schema(description="零售价（分为单位）") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer retailPrice; /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java index ea22d2cb4..8a88a3a73 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java @@ -67,16 +67,16 @@ public class SmErpUnitEntity extends Model { * 进价/单位分 */ @Schema(description="进价/单位分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer purchasePrice; /** * 零售价/单位分 */ @Schema(description="零售价/单位分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer retailPrice; /** @@ -89,16 +89,16 @@ public class SmErpUnitEntity extends Model { * 促销价 */ @Schema(description="促销价") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer promotionPrice; /** * 成本价 */ @Schema(description="成本价") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer costPrice; /** From 6eb8c8c7e22c89b0cc1d25b8992224ac1b152a2d Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 5 Mar 2025 14:25:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=A7=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/vo/erp/SmErpSupplierSimpleVo.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java index 5a9c32a11..5e83ef1f4 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java @@ -10,20 +10,17 @@ import lombok.Data; * @date 2024-12-20 11:08:08 */ @Data -@Schema(description = "货商类别下拉") +@Schema(description = "货商下拉") public class SmErpSupplierSimpleVo { - /** - * 类别ID - */ - @Schema(description="类别ID") - private Long id; + @Schema(description="id") + private Long supplierId; /** * 货商类别名称 */ - @Schema(description="货商类别名称") - private String typeName; + @Schema(description="货商名称") + private String supplierName; } \ No newline at end of file