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

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

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

@@ -222,6 +222,11 @@
    @TableField("platform_birthday_flag")
    private Integer platformBirthdayFlag;
    /**
     * 抽奖1开2关
     */
    @TableField("lottery_draw_flag")
    private Integer lotteryDrawFlag;
    /**
     * 店铺设置状态
     */
    @TableField("shop_custom_status")
@@ -303,14 +308,14 @@
     */
    @TableField("subscribe")
    private Integer subscribe;


    
    /**
     * 修改价格权限（0=关，1=开）
     */
    @TableField("modify_price_permission")
    private Integer modifyPricePermission;


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