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

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java

@@ -25,7 +25,7 @@
    */


   private Integer  recType;
   private Integer  type;
   
   /**
    * 数量
@@ -68,8 +68,6 @@
   /**
    * 操作人ID
    */
   private String  openId;

   private Long vipId;

   private Long shopId;