# Conflicts: # esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java # esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml # esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml # esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
