fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

 zq-erp/src/test/java/com/matrix/TaiYanAliyunSmsServiceTest.java

@@ -31,6 +31,8 @@
      SysProjServices byId = projServicesService.findById(215550L);
      byId.setVipId(5949L);
      taiYanAliyunSmsService.sendYycgNotice(byId);
      taiYanAliyunSmsService.sendHkNotice(byId);

   }