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

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

 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;