diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java index 211793073..c84398b85 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java @@ -54,7 +54,7 @@ public class EmisStaffController extends BaseController * 获取取件员列表 */ // @PreAuthorize("@ss.hasPermi('system:user:list')") - @JacksonFilter(include= {"empCode","empName","ownerSiteCode"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @RequestMapping("/getStaffList") public TableDataInfo getStaffList(@RequestParam("postCode")String postCode) { diff --git a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml index d975dad49..bcfecddfe 100644 --- a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml @@ -31,14 +31,16 @@ - - - - + + + + + + select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, country_area_id, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination