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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

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

@@ -124,6 +124,17 @@
   @Column(name = "co_urank")

   private Integer urank;// 用户等级 100-为超级会员



   @Column(name = "co_child_source_type")

   private String childSourceType;// 子来源类型



   public String getChildSourceType() {

      return childSourceType;

   }



   public void setChildSourceType(String childSourceType) {

      this.childSourceType = childSourceType;

   }



   public Integer getUrank() {

      return urank;

   }