Merge branch 'score_shop' into api_score_meger

jyy

2021-07-27 e9c394d8944d6afc40dc36336e4e93f4de1517c2

 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;