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

jyy

2021-06-12 4ad105d87c06b9d7ded694451ea752cbbad9e129

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

@@ -10,9 +10,7 @@
 * @author jiangyouyao
 */
@SpringBootApplication

@ComponentScan(basePackages = {"com.matrix.**"})

public class ZqErpApplication {

    public static void main(String[] args) {