Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

5 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 server/meeting/meeting_admin/src/main/java/com/doumee/MeetingAdminApplication.java

@@ -16,8 +16,8 @@
@Slf4j
@EnableAsync
@SpringBootApplication
@MapperScan("com.doumee.dao.*")
@EnableDiscoveryClient
@MapperScan("com.doumee.dao")
public class MeetingAdminApplication {
    public static void main(String[] args) {
        ApplicationContext context = SpringApplication.run(MeetingAdminApplication.class);