Conflicts: haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
