# Conflicts: # haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
Master xgh bug 11月 See merge request !392
Master bug 1101 See merge request !380
Master xgh bug 11月 See merge request !368