Merge branch 'developer'

姜友瑶

2022-08-09 41f67399e4e9e7f1df9ae910c1fb2ccb475435c7

 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;