Merge branch 'score_shop' into api_score_meger

jyy

2021-09-14 d139016c6abfb03d2cbd5ade3d1fec84d5757deb

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