Merge branch 'ty_fix' into alpha

Helius

2021-11-12 a970af3b193e40c72bb0e83d6d5f49777efe5a42

 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;