Merge branch 'api' into order_reform

wzy

2021-01-10 16da0ad1fda1dffa3019425a6887d38ed4217f44

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java

@@ -143,14 +143,14 @@
   /**
    * 业绩计算
    */
   private List<AchieveNew> achieveList;
   private List<AchieveNew> achaeveList;

   public List<AchieveNew> getAchieveList() {
      return achieveList;
   public List<AchieveNew> getAchaeveList() {
      return achaeveList;
   }

   public void setAchieveList(List<AchieveNew> achieveList) {
      this.achieveList = achieveList;
   public void setAchaeveList(List<AchieveNew> achaeveList) {
      this.achaeveList = achaeveList;
   }

   public String getPayMethodDetail() {