Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang

jiangqs

2023-06-04 3f7a3aefe2965459aed169383b285fba400cfe8c

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

@@ -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
     */