Merge branch 'ty_fix' into score_shop

Helius

2021-11-30 ba7ef6a2cfeff873da48469cc775c5f928ea45e8

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

@@ -12,6 +12,7 @@
 */
@SpringBootApplication
@ComponentScan(basePackages = {"com.matrix.**"})
@EnableAsync
public class ZqErpApplication {

    public static void main(String[] args) {