Merge branch 'score_shop' into api_score_meger

jyy

2021-08-09 38ab27c64d593d7b69a0d60eeafde32a9f14395e

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

@@ -68,8 +68,6 @@
   /**
    * 操作人ID
    */
   private String  openId;

   private Long vipId;

   private Long shopId;