Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

44323

2024-01-24 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java

@@ -281,6 +281,18 @@
    @TableField("auth_flag")
    private Integer authFlag;

    /**
     * 分账标记
     */
    @TableField("account_flag")
    private Integer accountFlag;
    /**
     * 店铺二维码
     */
    @TableField("shop_code")
    private String shopCode;


    @Override
    protected Serializable pkVal() {
        return this.shopId;