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

admin

2019-09-09 61c21f17b1ad94e4b0018c7e385195bab21b0b5c

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

@@ -84,6 +84,10 @@
    @Expose

    private Map<String, Object> rewardDetail;

    

    // 维权信息

    @Expose

    private WeiQuanInfo weiQuanInfo;

   
    

    

    // 直接收益人-ID

@@ -379,4 +383,11 @@
      this.otherState = otherState;

   }



   public WeiQuanInfo getWeiQuanInfo() {

      return weiQuanInfo;

   }



   public void setWeiQuanInfo(WeiQuanInfo weiQuanInfo) {

      this.weiQuanInfo = weiQuanInfo;

   }

}