Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-06 921f30c2112b68307d8b57b089dd582273df7ddb

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

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

    @TableField("shop_code")
    private String shopCode;

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