Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-06 540d17e0d21a252162e9eccf021d223cdb331119

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

@@ -36,6 +36,9 @@
   public final static String TYPE_INVITE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_invite.png";

   public final static String TYPE_SHARE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_share.png";



   public final static int ORDER_TYPE_ZIGOU = 1;// 自购

   public final static int ORDER_TYPE_SHARE = 20;// 分享



   @Column(name = "co_id")

   private Long id;