# Conflicts: # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffService.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java # haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml
