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

Pu Zhibing

3 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

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

@@ -309,6 +309,18 @@
    @TableField("subscribe")
    private Integer subscribe;
    
    /**
     * 修改价格权限（0=关，1=开）
     */
    @TableField("modify_price_permission")
    private Integer modifyPricePermission;
    
    /**
     * 抖音门店id
     */
    @TableField("poi_id")
    private String poiId;
    
    
    @Override
    protected Serializable pkVal() {