Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java

@@ -14,10 +14,9 @@


   public static int SHOP_TYPE_TB = 1;// 淘宝

   public static int SHOP_TYPE_TM = 2;// 天猫

   public static int SHOP_TYPE_JD = 20;

   public static int SHOP_TYPE_JD_SELF = 21;

   public static int SHOP_TYPE_PDD = 30;

	
   public static int SHOP_TYPE_JD = 20;// 京东

   public static int SHOP_TYPE_JD_SELF = 21;// 京东自营

   public static int SHOP_TYPE_PDD = 30;// 拼多多



   public static int STATE_NORMAL = 0;// 正常

   public static int STATE_OFFLINE = 1;// 下线