fix bug 6233

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketInfo.java

@@ -53,6 +53,8 @@ public class SupermarketInfo extends BaseEntity {
     @ApiModelProperty(value = "仓库id")
     private Long warehouseId;
 
+    private String warehouseName;
+
     /** 超市地址 */
     @Excel(name = "超市地址")
     @ApiModelProperty(value = "超市地址")

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketInfoMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="manager"    column="manager"    />
         <result property="contactTel"    column="contact_tel"    />
         <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
         <result property="address"    column="address"    />
         <result property="imgUrl"    column="img_url"    />
         <result property="ifPrintNow"    column="if_print_now"    />
@@ -36,9 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                si.warehouse_id, si.address, si.img_url, si.if_print_now, si.app_sale_mode,
                si.min_delivery_time, si.select_time_interval, si.delivery_cost, si.auto_verify_day,
                si.delivery_way, si.refund_limit_time, si.if_relate_drp, si.meal_code, si.if_enable_pay_code,
-               si.pay_code_url, si.create_by, si.create_time, si.update_by, si.update_time, ba.area_name
+               si.pay_code_url, si.create_by, si.create_time, si.update_by, si.update_time, ba.area_name, swi.warehouse_name
         from supermarket_info si
         left join basic_area ba on si.area_id = ba.area_id
+        left join supply_warehouse_info swi on swi.warehouse_id = si.warehouse_id
     </sql>
 
     <select id="selectSupermarketInfoList" parameterType="com.bonus.canteen.core.supermarket.domain.SupermarketInfo" resultMap="SupermarketInfoResult">