|
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
|
|
|
import com.gree.mall.manager.annotation.ZfireField;
|
|
|
import com.gree.mall.manager.enums.ExamineStatusEnum;
|
|
|
import com.gree.mall.manager.enums.GoodsStatusEnum;
|
|
|
+import com.gree.mall.manager.plus.entity.Goods;
|
|
|
import com.gree.mall.manager.plus.entity.GoodsApply;
|
|
|
import io.swagger.annotations.ApiModel;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
@@ -17,10 +18,10 @@ import java.util.Date;
|
|
|
|
|
|
@Data
|
|
|
@ApiModel
|
|
|
-public class GoodsApplyVO {
|
|
|
+public class GoodsApplyVO {
|
|
|
|
|
|
- @ZfireField(hide = true,tbName = "a")
|
|
|
- @TableId(value = "goods_apply_id", type = IdType.ID_WORKER_STR)
|
|
|
+ @ZfireField(tbName = "a")
|
|
|
+ @TableId(value = "申请单号", type = IdType.ID_WORKER_STR)
|
|
|
private String goodsApplyId;
|
|
|
|
|
|
@ZfireField(hide = true,tbName = "a")
|
|
@@ -31,6 +32,10 @@ public class GoodsApplyVO {
|
|
|
private String goodsName;
|
|
|
|
|
|
@ZfireField(tbName = "b")
|
|
|
+ @ApiModelProperty(value = "商品描述")
|
|
|
+ private String describeText;
|
|
|
+
|
|
|
+ @ZfireField(tbName = "b")
|
|
|
@ApiModelProperty(value = "商品图片")
|
|
|
private String imgUrl;
|
|
|
|
|
@@ -49,6 +54,20 @@ public class GoodsApplyVO {
|
|
|
private String categoryPid;
|
|
|
|
|
|
@ZfireField(tbName = "a")
|
|
|
+ @ApiModelProperty(value = "商家编号")
|
|
|
+ private String websitId;
|
|
|
+ @ZfireField(tbName = "a")
|
|
|
+ @ApiModelProperty(value = "商家名称")
|
|
|
+ private String websitName;
|
|
|
+ @ZfireField(tbName = "a",hide = true)
|
|
|
+ @ApiModelProperty(value = "上级商户")
|
|
|
+ private String companyWechatId;
|
|
|
+ @ZfireField(tbName = "a")
|
|
|
+ @ApiModelProperty(value = "上级商户")
|
|
|
+ private String companyName;
|
|
|
+
|
|
|
+
|
|
|
+ @ZfireField(tbName = "a")
|
|
|
@ApiModelProperty(value = "划线价格")
|
|
|
private BigDecimal orgGoodsPrice;
|
|
|
@ZfireField(tbName = "a")
|