Merge branch 'api_score_meger' into alpha

Helius

2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivitiesSeckillRecord.java

@@ -36,7 +36,7 @@
   /**
    * 用户主键
    */
   private String  userId;
   private Long  userId;

   private Long actId;

@@ -94,11 +94,11 @@
      this.orderId=orderId;
   }

   public String getUserId() {
   public Long getUserId() {
      return userId;
   }

   public void setUserId(String userId) {
   public void setUserId(Long userId) {
      this.userId = userId;
   }