-
Merge remote-tracking branch 'origin/bugfix/xgh1212' into developer · 9e8b0564
# Conflicts: # haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HaobanCommonMQApiService.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HaobanCommonMQApiServiceImpl.java
徐高华 authored