Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 ae3e722d471d7e844acd25f124a1fec42ac714a0

 fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java

@@ -23,9 +23,10 @@
   private static final long serialVersionUID = 1L;



   // 淘宝

   public final static int TYPE_TAOBAO = 1;

   // 京东

   public final static int TYPE_JINGDONG = 2;

   public final static String TYPE_TAOBAO = "TB";

   // 天猫

   public final static String TYPE_TMALL = "TM";

		


   @Column(name = "cog_id")

   private Long id;