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

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

 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;

   }