xuhy
2024-11-06 51a13368cd66ffa48f37c8e2f0b8e3ba98f0e95c
修改
2个文件已修改
8 ■■■■ 已修改文件
ruoyi-system/src/main/java/com/ruoyi/system/domain/TShop.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TShopMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/domain/TShop.java
@@ -40,6 +40,9 @@
    @ApiModelProperty(value = "店铺负责人")
    @TableField("shopHead")
    private String shopHead;
    @ApiModelProperty(value = "区域")
    @TableField("area")
    private String area;
    @ApiModelProperty(value = "店铺样式")
    @TableField("shopStyle")
ruoyi-system/src/main/resources/mapper/system/TShopMapper.xml
@@ -21,16 +21,17 @@
        <result column="updateBy" property="updateBy" />
        <result column="userId" property="userId" />
        <result column="mealType" property="mealType" />
        <result column="area" property="area" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, shopType, shopName,shopHead, shopStyle, systemName, systemLogo, businessLicense,status,account,
            createTime, updateTime, disabled, createBy, updateBy,userId,mealType
            createTime, updateTime, disabled, createBy, updateBy,userId,mealType,area
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TShopVO">
        select id, shopType, shopName,shopHead, shopStyle, systemName, systemLogo, businessLicense,
        status,account, createTime, updateTime, disabled, createBy, updateBy,userId,mealType
        status,account, createTime, updateTime, disabled, createBy, updateBy,userId,mealType,area
        from t_shop ts
        <where>
            <if test="query.shopType != null">