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

jyy

2021-07-31 59c430b896ee4577857dc0725bf6a5df4b99e1f7

 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;