Joburgess 5 éve
szülő
commit
4b03a3dbe8

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Goods.java

@@ -122,10 +122,13 @@ public class Goods {
 	@ApiModelProperty(value = "商品类型", required = false)
 	private GoodsType type;
 
+	@ApiModelProperty(value = "备查货号,进货渠道")
 	private String supplyChannel;
 
+	@ApiModelProperty(value = "客户端是否展示")
 	private Integer clientShow;
 
+	@ApiModelProperty(value = "库存类型")
 	private StockType stockType;
 
 	public Integer getClientShow() {

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/enums/StockType.java

@@ -9,7 +9,7 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum StockType implements BaseEnum<String, StockType> {
     INTERNAL("INTERNAL", "内部"),
     EXTERNAL("EXTERNAL", "外部"),
-    ALL("ALL", "全部"),;
+    ALL("ALL", "内部、外部");
 
     private String code;
     private String msg;

BIN
mec-web/src/main/resources/excelTemplate/商品导入模板.xls