diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java index e435c00..87c2d55 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java @@ -1,6 +1,5 @@ package cc.yunxi.controller; - import cc.yunxi.aspect.UserTypeAnnotation; import cc.yunxi.common.domain.CommonResult; import cc.yunxi.common.domain.PageDTO; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/Product.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/Product.java index b9140cc..f126484 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/Product.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/Product.java @@ -43,14 +43,18 @@ public class Product { @TableField("spec") private String spec; + @ApiModelProperty("描述") + @TableField("describe") + private String describe; + + @ApiModelProperty("图片") + @TableField("photo") + private String photo; + @ApiModelProperty("库存单位") @TableField("unit") private ProductUnitEnum unit; - @ApiModelProperty("备注") - @TableField("remak") - private String remark; - @ApiModelProperty("创建时间") @TableField("f_creator_time") private LocalDateTime fCreatorTime; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductRespVO.java index 16413f4..40cae34 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductRespVO.java @@ -47,12 +47,15 @@ public class ProductRespVO { @ApiModelProperty("废品规格") private String spec; + @ApiModelProperty("废品描述") + private String describe; + + @ApiModelProperty("废品图") + private String photo; + @ApiModelProperty("废品单位") private ProductUnitEnum unit; - @ApiModelProperty("备注") - private String remark; - @ApiModelProperty("废品定价时间") private LocalDateTime creatorTime; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java index 802da9c..884f597 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java @@ -28,5 +28,10 @@ public class ProductSimpleVO { @ApiModelProperty("废品名称") private String name; + @ApiModelProperty("废品描述") + private String describe; + + @ApiModelProperty("废品图") + private String photo; } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleStationServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleStationServiceImpl.java index 8989f3a..c26e39b 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleStationServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleStationServiceImpl.java @@ -110,7 +110,8 @@ public class RecycleStationServiceImpl extends ServiceImpl