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/ShopProportion.java

@@ -42,7 +42,7 @@
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    private Long shopId;
    /**
     * 商户类型
     */
@@ -62,7 +62,7 @@
     * 更新用户id
     */
    @TableField("update_user_id")
    private Integer updateUserId;
    private Long updateUserId;


    @Override