Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 47a58d6b06b53e01321d2398cbc5a35c9923f705

 flower_city/src/main/java/com/dg/core/WMApplication.java

@@ -5,7 +5,7 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;

//@ServletComponentScan("com.dg.core.task")  //定时任务启动开关
@ServletComponentScan("com.dg.core.task")  //定时任务启动开关
@SpringBootApplication
@MapperScan("com.dg.core.db")
public class WMApplication {