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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

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

@@ -9,6 +9,7 @@


import com.google.gson.annotations.Expose;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;



/**

 * 订单-简版

@@ -88,6 +89,12 @@
    @Expose

    private WeiQuanInfo weiQuanInfo;

   

    // 补贴信息

    @Expose

    private ClientTextStyleVO subsidy;

    // 补贴解释信息

    @Expose

    private List<String> subsidyList;

    

    

    // 直接收益人-ID

@@ -390,4 +397,20 @@
   public void setWeiQuanInfo(WeiQuanInfo weiQuanInfo) {

      this.weiQuanInfo = weiQuanInfo;

   }



   public ClientTextStyleVO getSubsidy() {

      return subsidy;

   }



   public void setSubsidy(ClientTextStyleVO subsidy) {

      this.subsidy = subsidy;

   }



   public List<String> getSubsidyList() {

      return subsidyList;

   }



   public void setSubsidyList(List<String> subsidyList) {

      this.subsidyList = subsidyList;

   }

}