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

jyy

2021-04-07 5394194396290aa232910a571d6f4ef463a92a6b

 zq-erp/src/main/java/com/matrix/ZqErpApplication.java

@@ -3,7 +3,6 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableAsync;

/**
 * spring boot入口