fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

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