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

jyy

2021-04-06 abe25c659140b8c3f4db90ce943f4143a7d7f40f

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

@@ -44,10 +44,7 @@



   /**
    * 用户openId
    */
   private String openId;


   /**
    * erp用户Id