Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-04-16 949e7e46086e034d747746d2b450d7c262c9a594

 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;