Merge branch 'score_shop' into alpha

Helius

2021-11-02 4ae7f7f4de4f034c7a772975d7c457391e28b0b8

 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;