Merge remote-tracking branch 'origin/div' into div

admin

2019-09-10 f7fc64d5ed3d19e131bc84398ae7e801ff30341e

 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;