Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

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