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

Pu Zhibing

2 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/LotteryEvent.java

@@ -115,7 +115,7 @@
    * 创建用户id
    */
   @TableField("create_user_id")
   private Integer createUserId;
   private Long createUserId;
   /**
    * 创建时间
    */