Merge branch 'score_shop' into api_score_meger

jyy

2021-07-10 870960399814cff73d1e6ef93fccb11bede8d464

 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;