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

doum

2 天以前 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 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);