Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java

@@ -33,9 +33,19 @@
    */
   public static final int SCORE_VIP_TYPE_REFERRER=3;
   /**
    * 获取类型(4参加活动)
    */
   public static final int SCORE_VIP_TYPE_JOIN_ACTIVE=4;


   /**
    * 获取类型(4人工调整)
    */
   public static final int SCORE_VIP_TYPE_USERCHANGE=4;
   /**
    * 获取类型(5积分失效)
    */
   public static final int SCORE_OVER_TIME=5;

   /** 有效*/
   public static final int SCORE_STATUS_YX=1;