Merge branch 'score_shop' into api_score_meger

jyy

2021-08-09 38ab27c64d593d7b69a0d60eeafde32a9f14395e

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

@@ -192,6 +192,8 @@

   private String vipQueryKey;

   private Long achieveRuleId;


   /**
    * 订单编号
@@ -541,6 +543,13 @@
      this.day = day;
   }

   public Long getAchieveRuleId() {
      return achieveRuleId;
   }

   public void setAchieveRuleId(Long achieveRuleId) {
      this.achieveRuleId = achieveRuleId;
   }

   public String getOrderNo() {
      return orderNo;