Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/izouma/zhirongip/service/supply/TechnicalManagerService.java
#	src/main/yzzscq-web/src/assets/icon_renzheng@3x.png
#	src/main/yzzscq-web/src/assets/png-Selected@3x.png
#	src/main/yzzscq-web/src/assets/png-chengjiaoanli-bg@3x.png
#	src/main/yzzscq-web/src/assets/png-gongjice-bg@3x.png
#	src/main/yzzscq-web/src/assets/png-ipfuwu-bg@3x.png
#	src/main/yzzscq-web/src/assets/png-jishujingliren-bg@3x.png
#	src/main/yzzscq-web/src/assets/png-xuqiuce-bg@3x.png
#	src/main/yzzscq-web/src/assets/top_nav_icon_xiaoxi@3x.png
#	src/main/yzzscq-web/src/assets/xiaoxi_icon_xitong@3x.png
#	src/main/yzzscq-web/src/assets/xuanzhong@3x.png
#	src/main/yzzscq-web/src/components/list/ServiceDetailGrid.vue
#	src/main/yzzscq-web/src/components/newsDynamic.vue
#	src/main/yzzscq-web/src/components/newsDynamics.vue
#	src/main/yzzscq-web/src/components/newsField.vue
#	src/main/yzzscq-web/src/views/Allsearch.vue
#	src/test/java/com/izouma/zhirongip/service/supply/PatentServiceTest.java

src/test/java/com/izouma/zhirongip/repo/SettingRepoTest.java

@@ -1,6 +1,6 @@
 package com.izouma.zhirongip.repo;
 
-import com.izouma.zhirongip.ApplicationTests;
+import com.izouma.yzzscq.ApplicationTests;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 

src/test/java/com/izouma/zhirongip/repo/SmsRecordRepoTest.java

@@ -1,6 +1,6 @@
 package com.izouma.zhirongip.repo;
 
-import com.izouma.zhirongip.domain.SmsRecord;
+import com.izouma.yzzscq.domain.SmsRecord;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

src/test/java/com/izouma/zhirongip/service/supply/TechnicalManagerServiceTest.java

@@ -1,7 +1,8 @@
 package com.izouma.zhirongip.service.supply;
 
-import com.izouma.zhirongip.ApplicationTests;
-import com.izouma.zhirongip.dto.PageQuery;
+
+import com.izouma.yzzscq.ApplicationTests;
+import com.izouma.yzzscq.dto.PageQuery;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 

src/test/java/com/izouma/zhirongip/service/supply/TechnologyProductServiceTest.java

@@ -1,7 +1,8 @@
 package com.izouma.zhirongip.service.supply;
 
-import com.izouma.zhirongip.ApplicationTests;
-import com.izouma.zhirongip.dto.PageQuery;
+
+import com.izouma.yzzscq.ApplicationTests;
+import com.izouma.yzzscq.dto.PageQuery;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;