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

huliguo

8 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

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

@@ -296,13 +296,13 @@
     */
    @TableField("shop_code")
    private String shopCode;
    

    /**
     * 小鹅通讲师id
     */
    @TableField("xiaoe_user_id")
    private String xiaoeUserId;
    

    /**
     * 预约状态（0=关，1=开）
     */
@@ -314,11 +314,11 @@
     */
    @TableField("modify_price_permission")
    private Integer modifyPricePermission;
    
    


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

}