# Conflicts: # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/contact/impl/ContactLogServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/contact/ContactOrderApiServiceImpl.java
异常 See merge request !2939
sql调整 See merge request !2937
清除建联逻辑 See merge request !2935
清除建联逻辑 See merge request !2933
# Conflicts: # haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java