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

admin

2020-06-08 47f157086a556d96e7bcfc9adfe17ecf7c154dfe

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

@@ -135,6 +135,12 @@
   private String orderDesc;// 订单描述





   // 店铺类型 2.1.2新增

   @Expose

   private ClientTextStyleVO shopType;



		


   public String getVipOrderDesc() {

      return vipOrderDesc;

   }

@@ -455,4 +461,12 @@
      this.rebateLink = rebateLink;

   }

   

   public ClientTextStyleVO getShopType() {

      return shopType;

   }



   public void setShopType(ClientTextStyleVO shopType) {

      this.shopType = shopType;

   }

	
}