<<<<<<< HEAD D:\hurui\huifu\hai-server\hai-msg\src\main\java\com\MsgApplication.java D:\hurui\huifu\hai-server\hai-msg\src\main\java\com\msg\controller\HighMegController.java ======= /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/controller/HighMegController.java /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/SysConst.java /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/CorsConfig.java /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/RedisConfig.java /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/SwaggerConfig.java /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/ConfigListener.java /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/SysConfig.java /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/MultipartConfig.java /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/AuthConfig.java /Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/MsgApplication.java >>>>>>> b24855a980ebeb66e6552653e757c54d5ad638f4