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

huliguo

15 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java

@@ -32,7 +32,7 @@
     * 记录id
     */
    @TableId(value = "record_id", type = IdType.AUTO)
    private Integer recordId;
    private Long recordId;
    /**
     * 删除标记
     */
@@ -42,7 +42,7 @@
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    private Long shopId;
    /**
     * 记录类型1订单支付2取消订单3
     */
@@ -72,7 +72,7 @@
     * 关联用户id
     */
    @TableField("relation_user_id")
    private Integer relationUserId;
    private Long relationUserId;
    /**
     * 关联订单id
     */