java/qijisheng.git

			@@ -49,8 +49,7 @@
			Page<Shop> page = new Page<>();
			page.setCurrent(PageNum);
			page.setSize(pageSize);
			IPage<Shop> shopIPage = shopMapper.selectShopList(page, shop);
			return shopIPage;
			return shopMapper.selectShopList(page, shop);
			}

			@Override

			@@ -58,20 +58,21 @@
			ts.id,
			ts.`name`,
			ts.business_date,
			tau.`name` managerName,
			ts.start_time,
			ts.end_time,
			ts.phone,
			ts.address,
			ts.`status`
			ts.`status`,
			ts.shop_manager
			FROM
			`qijisheng_other`.t_shop ts
			LEFT JOIN `qijisheng_account`.t_app_user tau ON ts.app_user_id = tau.id
			t_shop ts
			<where>
			ts.del_flag = 0
			<if test="shop.name != null and shop.name != ''">
			and ts.name like concat('%',#{shop.name},'%')
			</if>
			<if test="shop.managerName != null and shop.managerName != ''">
			and tau.name like concat('%',#{shop.managerName},'%')
			<if test="shop.shopManager != null and shop.shopManager != ''">
			and ts.shop_manager like concat('%',#{shop.shopManager},'%')
			</if>
			<if test="shop.phone != null and shop.phone != ''">
			and ts.phone like concat('%',#{shop.phone},'%')

	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -163,9 +163,6 @@
			@TableField("create_time")
			private LocalDateTime createTime;

			@ApiModelProperty(value = "店长姓名")
			@TableField(exist = false)
			private String managerName;


			}