fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

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

   }