Merge branch 'score_shop' into api_score_meger

jyy

2021-07-31 78472da3395d1db45b6a76688c72a2c2a372c47a

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

@@ -42,6 +42,10 @@
    * 获取类型(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;