# Conflicts: # hai-bweb/src/main/java/com/bweb/controller/HighTestController.java # hai-cweb/src/main/java/com/cweb/controller/HighTestController.java # hai-service/src/main/java/com/hai/common/utils/WxUtils.java