Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/pom.xml

@@ -8,13 +8,6 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <dependencies>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-ymt-common</artifactId>
-            <version>${amos-biz-boot.version}</version>
-        </dependency>
-    </dependencies>
     <artifactId>amos-boot-module-jg</artifactId>
     <description>监管模块</description>
     <packaging>pom</packaging>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/pom.xml

@@ -13,20 +13,9 @@
     <dependencies>
         <dependency>
             <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-jyjc-common</artifactId>
-            <version>${amos-biz-boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-tcm-common</artifactId>
-            <version>${amos-biz-boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-module-common-api</artifactId>
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
 </project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-common/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>amos-boot-module-jyjc</artifactId>
-        <groupId>com.amosframework.boot</groupId>
-        <version>1.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <version>1.0.0</version>
-    <artifactId>amos-boot-module-jyjc-common</artifactId>
-</project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/pom.xml

@@ -16,6 +16,5 @@
     <modules>
         <module>amos-boot-module-jyjc-api</module>
         <module>amos-boot-module-jyjc-biz</module>
-        <module>amos-boot-module-jyjc-common</module>
     </modules>
 </project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/pom.xml

@@ -17,11 +17,6 @@
             <version>${amos-biz-boot.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-tcm-common</artifactId>
-            <version>${amos-biz-boot.version}</version>
-        </dependency>
-        <dependency>
             <groupId>net.javacrumbs.shedlock</groupId>
             <artifactId>shedlock-spring</artifactId>
         </dependency>
@@ -33,5 +28,14 @@
             <artifactId>amos-component-rule</artifactId>
             <groupId>com.yeejoin</groupId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-elasticsearch</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <artifactId>amos-component-rule</artifactId>
+            <groupId>com.yeejoin</groupId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/AlertCalledDto.java → amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/AlertCalledDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseInstitutionRegisterDto.java → amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseInstitutionRegisterDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitIcDto;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/ElevatorDto.java → amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/ElevatorDto.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/ElevatorInsureDto.java → amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/ElevatorInsureDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;