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

yujian

2019-12-31 06c9ac9b43af8492a9dbd1eee1a309170eed71d9

 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;