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

admin

2020-03-03 24df43fb3f2e136d3d768abf89f098c290c2bab8

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

@@ -121,6 +121,17 @@
   @Column(name = "co_update_time")

   private Date updateTime;



   @Column(name = "co_urank")

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



   public Integer getUrank() {

      return urank;

   }



   public void setUrank(Integer urank) {

      this.urank = urank;

   }



   public CommonOrder() {



   }