diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketInfo.java index dd23ca6..ad7557b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketInfo.java @@ -35,7 +35,7 @@ public class SupermarketInfo extends BaseEntity { /** 管理员 */ @Excel(name = "管理员") @ApiModelProperty(value = "管理员") - private Long manager; + private String manager; /** 联系电话 */ @Excel(name = "联系电话") diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketInfoMapper.xml index 6b46a65..d38807d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketInfoMapper.xml @@ -31,7 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select supermarket_id, supermarket_name, area_id, manager, contact_tel, warehouse_id, address, img_url, if_print_now, app_sale_mode, min_delivery_time, select_time_interval, delivery_cost, auto_verify_day, delivery_way, refund_limit_time, if_relate_drp, meal_code, if_enable_pay_code, pay_code_url, create_by, create_time, update_by, update_time from supermarket_info + select supermarket_id, supermarket_name, area_id, manager, contact_tel, + warehouse_id, address, img_url, if_print_now, app_sale_mode, + min_delivery_time, select_time_interval, delivery_cost, auto_verify_day, + delivery_way, refund_limit_time, if_relate_drp, meal_code, if_enable_pay_code, + pay_code_url, create_by, create_time, update_by, update_time + from supermarket_info