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

admin

2020-03-01 c5f54810f60e036317562b1b42cfeafd18e984c5

 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java

@@ -124,6 +124,18 @@


   @Expose

   private boolean vipOrder;// 是否为超级用户订单

	
   @Expose

   private String vipOrderDesc;// 超级订单描述





   public String getVipOrderDesc() {

      return vipOrderDesc;

   }



   public void setVipOrderDesc(String vipOrderDesc) {

      this.vipOrderDesc = vipOrderDesc;

   }



   public boolean isVipOrder() {

      return vipOrder;