diff --git a/.idea/artifacts/pluss_manage_page_war_exploded.xml b/.idea/artifacts/pluss_manage_page_war_exploded.xml
index 1465475..8969204 100644
--- a/.idea/artifacts/pluss_manage_page_war_exploded.xml
+++ b/.idea/artifacts/pluss_manage_page_war_exploded.xml
@@ -82,7 +82,6 @@
           <element id="library" level="project" name="Maven: com.github.virtuald:curvesapi:1.06" />
           <element id="library" level="project" name="Maven: cn.jpush.api:jpush-client:3.5.5" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.29.Final" />
-          <element id="library" level="project" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" />
           <element id="library" level="project" name="Maven: cn.jpush.api:jiguang-common:1.1.12" />
           <element id="library" level="project" name="Maven: com.mob.push.sdk:mobpush-websdkv3-java:1.0.4" />
           <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.1.0.RELEASE" />
@@ -96,17 +95,6 @@
           <element id="library" level="project" name="Maven: javax.servlet:javax.servlet-api:4.0.1" />
           <element id="library" level="project" name="Maven: com.jhlabs:filters:2.0.235-1" />
           <element id="library" level="project" name="Maven: com.aliyun:dysmsapi20170525:2.0.21" />
-          <element id="library" level="project" name="Maven: com.aliyun:tea-util:0.2.14" />
-          <element id="library" level="project" name="Maven: com.aliyun:endpoint-util:0.0.7" />
-          <element id="library" level="project" name="Maven: com.aliyun:tea:1.2.0" />
-          <element id="library" level="project" name="Maven: com.aliyun:tea-openapi:0.2.6" />
-          <element id="library" level="project" name="Maven: com.aliyun:credentials-java:0.2.4" />
-          <element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
-          <element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
-          <element id="library" level="project" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" />
-          <element id="library" level="project" name="Maven: com.aliyun:tea-xml:0.1.5" />
-          <element id="library" level="project" name="Maven: org.dom4j:dom4j:2.0.3" />
-          <element id="library" level="project" name="Maven: com.aliyun:openapiutil:0.1.14" />
           <element id="library" level="project" name="Maven: cn.hutool:hutool-all:5.8.4" />
           <element id="library" level="project" name="Maven: xml-security:xmlsec:1.3.0" />
           <element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.3.2" />
@@ -114,8 +102,6 @@
           <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" />
           <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.8.1" />
           <element id="library" level="project" name="Maven: org.projectlombok:lombok:1.18.20" />
-          <element id="library" level="project" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" />
-          <element id="library" level="project" name="Maven: com.squareup.okio:okio:1.15.0" />
           <element id="library" level="project" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.23" />
           <element id="library" level="project" name="Maven: com.alibaba:druid:1.1.23" />
           <element id="library" level="project" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.9.1" />
@@ -191,6 +177,25 @@
           <element id="library" level="project" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" />
+          <element id="library" level="project" name="Maven: com.aliyun:cloudauth20200618:2.0.3" />
+          <element id="library" level="project" name="Maven: com.aliyun:oss-client:3.0.2" />
+          <element id="library" level="project" name="Maven: com.aliyun:credentials-java:0.2.5" />
+          <element id="library" level="project" name="Maven: com.aliyun:tea-xml:0.1.1" />
+          <element id="library" level="project" name="Maven: com.aliyun:openplatform20191219:3.0.2" />
+          <element id="library" level="project" name="Maven: com.aliyun:tea-rpc-util:0.1.2" />
+          <element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
+          <element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
+          <element id="library" level="project" name="Maven: com.aliyun:tea-rpc:0.1.2" />
+          <element id="library" level="project" name="Maven: com.aliyun:oss-util:1.0.0" />
+          <element id="library" level="project" name="Maven: com.aliyun:tea-util:0.2.11" />
+          <element id="library" level="project" name="Maven: com.aliyun:tea-fileform:0.0.3" />
+          <element id="library" level="project" name="Maven: com.aliyun:endpoint-util:0.0.6" />
+          <element id="library" level="project" name="Maven: com.aliyun:tea:1.2.3" />
+          <element id="library" level="project" name="Maven: com.squareup.okhttp3:okhttp:3.12.13" />
+          <element id="library" level="project" name="Maven: com.squareup.okio:okio:1.15.0" />
+          <element id="library" level="project" name="Maven: com.aliyun:tea-openapi:0.0.16" />
+          <element id="library" level="project" name="Maven: com.aliyun:openapiutil:0.1.6" />
+          <element id="library" level="project" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" />
           <element id="library" level="project" name="Maven: javax.annotation:javax.annotation-api:1.3.2" />
           <element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" />
           <element id="library" level="project" name="Maven: org.apache.taglibs:taglibs-standard-impl:1.2.5" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 712ab9d..2e1bf07 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -16,5 +16,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 0795b6c..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="wap部分配置">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pluss-common-bundle/src/main/resources/config/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/src/main/resources/config/application-common.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="localRepository" value="D:\java\maven\maven-repo" />
-        <option name="userSettingsFile" value="D:\java\maven\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="ProjectId" id="2JRKsoH7USttjLLgTdufP7isMIQ" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
-    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="RequestMappingsPanelOrder1" value="1" />
-    <property name="RequestMappingsPanelWidth0" value="75" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="模块" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="configurationTypes">
-      <set>
-        <option value="SpringBootApplicationConfigurationType" />
-      </set>
-    </option>
-  </component>
-  <component name="RunManager" selected="Spring Boot.WapApplication">
-    <configuration name="Base64Util" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="cn.pluss.platform.util.Base64Util" />
-      <module name="pluss-common-bundle" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="cn.pluss.platform.util.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="ApiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="pluss-api-page" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.ApiApplication" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="ManageApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="pluss-manage-page" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.ManageApplication" />
-      <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="WapApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="pluss-wap-page" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.WapApplication" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <list>
-      <item itemvalue="Spring Boot.ApiApplication" />
-      <item itemvalue="Spring Boot.ManageApplication" />
-      <item itemvalue="Spring Boot.WapApplication" />
-      <item itemvalue="应用程序.Base64Util" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="应用程序.Base64Util" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="默认任务">
-      <changelist id="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="" />
-      <created>1672035665897</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1672035665897</updated>
-      <workItem from="1672035668891" duration="14242000" />
-      <workItem from="1672710504604" duration="3600000" />
-      <workItem from="1672794561883" duration="14930000" />
-      <workItem from="1672880913444" duration="22544000" />
-      <workItem from="1672967071131" duration="28253000" />
-      <workItem from="1673053725300" duration="14019000" />
-      <workItem from="1673226451285" duration="22191000" />
-      <workItem from="1673312865230" duration="27697000" />
-      <workItem from="1673400058089" duration="30123000" />
-      <workItem from="1673486519964" duration="33762000" />
-      <workItem from="1673571894423" duration="19662000" />
-      <workItem from="1673831400192" duration="17300000" />
-      <workItem from="1673917492868" duration="27221000" />
-      <workItem from="1674003718074" duration="22135000" />
-      <workItem from="1674867825532" duration="12546000" />
-      <workItem from="1674889612655" duration="4695000" />
-      <workItem from="1674894362598" duration="8405000" />
-      <workItem from="1674954816004" duration="25774000" />
-      <workItem from="1675040599799" duration="1553000" />
-    </task>
-    <task id="LOCAL-00001" summary="更改配置">
-      <created>1674892648184</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1674892648184</updated>
-    </task>
-    <task id="LOCAL-00002" summary="更改发送短信，">
-      <created>1674897664824</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1674897664824</updated>
-    </task>
-    <task id="LOCAL-00003" summary="更改部分配置（百度文字识别）">
-      <created>1674956689324</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1674956689324</updated>
-    </task>
-    <task id="LOCAL-00004" summary="wap部分配置">
-      <created>1674959790671</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1674959790671</updated>
-    </task>
-    <option name="localTasksCounter" value="5" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="origin/master" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="更改配置" />
-    <MESSAGE value="更改发送短信，" />
-    <MESSAGE value="更改部分配置（百度文字识别）" />
-    <MESSAGE value="wap部分配置" />
-    <option name="LAST_COMMIT_MESSAGE" value="wap部分配置" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java</url>
-          <line>336</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java</url>
-          <line>2565</line>
-          <option name="timeStamp" value="17" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java</url>
-          <line>1478</line>
-          <option name="timeStamp" value="19" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-    <pin-to-top-manager>
-      <pinned-members>
-        <PinnedItemInfo parentTag="com.aliyun.oss.OSSClient" memberName="uploadOperation" />
-      </pinned-members>
-    </pin-to-top-manager>
-  </component>
-  <component name="XSLT-Support.FileAssociations.UIState">
-    <expand />
-    <select />
-  </component>
-</project>
\ No newline at end of file
diff --git a/code-generator/code-generator.iml b/code-generator/code-generator.iml
index 5850703..0594655 100644
--- a/code-generator/code-generator.iml
+++ b/code-generator/code-generator.iml
@@ -35,6 +35,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/pluss-api-page/pluss-api-page.iml b/pluss-api-page/pluss-api-page.iml
index 158f25f..6749a36 100644
--- a/pluss-api-page/pluss-api-page.iml
+++ b/pluss-api-page/pluss-api-page.iml
@@ -35,6 +35,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -124,8 +126,6 @@
     <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
@@ -214,6 +214,15 @@
     <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
     <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.github.tencentyun:tls-sig-api:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
     <orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
diff --git a/pluss-api-page/target/classes/application-dev.yml b/pluss-api-page/target/classes/application-dev.yml
deleted file mode 100644
index 9ca9e82..0000000
--- a/pluss-api-page/target/classes/application-dev.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-spring:
-  datasource:
-      url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
-      username: root
-      password: CZGmysqlroot@123
-      driver-class-name: com.mysql.jdbc.Driver
-parameter:
-  ### 这个根据自己的情况配置
-  domain:
-
-swagger:
-  ### 生产环境不允许访问swagger
-  production: false
-
-logging:
-  config: classpath:log4j2-dev.xml
diff --git a/pluss-api-page/target/classes/application-prod.yml b/pluss-api-page/target/classes/application-prod.yml
deleted file mode 100644
index 19a9c13..0000000
--- a/pluss-api-page/target/classes/application-prod.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-spring:
-  datasource:
-    url:
-    username:
-    password:
-    driver-class-name: com.mysql.jdbc.Driver
-
-rabbitmq:
-  enabled: true
-
-swagger:
-  ### 生产环境不允许访问swagger
-  production: true
-
-logging:
-  config: classpath:log4j2-prod.xml
diff --git a/pluss-api-page/target/classes/application-test.yml b/pluss-api-page/target/classes/application-test.yml
deleted file mode 100644
index 84016bb..0000000
--- a/pluss-api-page/target/classes/application-test.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# 测试服务器上的数据库连接
-spring:
-  datasource:
-    url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
-    username: root
-    password: CZGmysqlroot@123
-    driver-class-name: com.mysql.jdbc.Driver
-
-parameter:
-  domain:
-
-swagger:
-  ### 生产环境不允许访问swagger
-  production: true
diff --git a/pluss-api-page/target/classes/application.yml b/pluss-api-page/target/classes/application.yml
deleted file mode 100644
index 549411a..0000000
--- a/pluss-api-page/target/classes/application.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-spring:
-  output:
-    ansi:
-      enabled: always
-  profiles:
-    ###  将一些固定的配置放到下级文件夹下的yml文件中
-    include: common, ryx, ys
-    active: dev
-  mvc:
-    view:
-      prefix: /WEB-INF/jsp/
-      suffix: .jsp
-  resources:
-    static-locations: classpath:/static
-  datasource:
-    druid:
-      break-after-acquire-failure: true
-      connection-error-retry-attempts: 1
-  task:
-    execution:
-      pool:
-        max-size: 20
-
-server:
-  servlet:
-    context-path: /api
-  port: 7004
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/ApiApplication.class b/pluss-api-page/target/classes/cn/pluss/platform/ApiApplication.class
deleted file mode 100644
index 5dbf391..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/ApiApplication.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/annotation/Cert.class b/pluss-api-page/target/classes/cn/pluss/platform/annotation/Cert.class
deleted file mode 100644
index 3b93c29..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/annotation/Cert.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/annotation/OpLog.class b/pluss-api-page/target/classes/cn/pluss/platform/annotation/OpLog.class
deleted file mode 100644
index 9e14efe..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/annotation/OpLog.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/annotation/ThirdAuth.class b/pluss-api-page/target/classes/cn/pluss/platform/annotation/ThirdAuth.class
deleted file mode 100644
index 6d8abe8..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/annotation/ThirdAuth.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/aop/CertAspect.class b/pluss-api-page/target/classes/cn/pluss/platform/aop/CertAspect.class
deleted file mode 100644
index 814c0d6..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/aop/CertAspect.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/aop/OpLogAspect.class b/pluss-api-page/target/classes/cn/pluss/platform/aop/OpLogAspect.class
deleted file mode 100644
index 0724523..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/aop/OpLogAspect.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/aop/TrimAspect.class b/pluss-api-page/target/classes/cn/pluss/platform/aop/TrimAspect.class
deleted file mode 100644
index a3f5726..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/aop/TrimAspect.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/configurer/Swagger2Configurer.class b/pluss-api-page/target/classes/cn/pluss/platform/configurer/Swagger2Configurer.class
deleted file mode 100644
index f0e7414..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/configurer/Swagger2Configurer.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/configurer/WebConfigurer.class b/pluss-api-page/target/classes/cn/pluss/platform/configurer/WebConfigurer.class
deleted file mode 100644
index d9d9c9d..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/configurer/WebConfigurer.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/AllExceptionResolver.class b/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/AllExceptionResolver.class
deleted file mode 100644
index 7974261..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/AllExceptionResolver.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/CurrentUserMethodArgumentResolver.class b/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/CurrentUserMethodArgumentResolver.class
deleted file mode 100644
index d669f49..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/CurrentUserMethodArgumentResolver.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/FastJsonHttpMessageConverterEx.class b/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/FastJsonHttpMessageConverterEx.class
deleted file mode 100644
index e57c806..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/FastJsonHttpMessageConverterEx.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/StringDeserializer.class b/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/StringDeserializer.class
deleted file mode 100644
index 7c922ec..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/StringDeserializer.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/AccountBalanceController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/AccountBalanceController.class
deleted file mode 100644
index 85fc8db..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/AccountBalanceController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/AccountController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/AccountController.class
deleted file mode 100644
index 4effab0..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/AccountController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityActivateController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityActivateController.class
deleted file mode 100644
index 035acf6..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityActivateController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityConsumReturnController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityConsumReturnController.class
deleted file mode 100644
index fe90265..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityConsumReturnController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityRechargeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityRechargeController.class
deleted file mode 100644
index d804a14..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityRechargeController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityRecommendController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityRecommendController.class
deleted file mode 100644
index 12ee697..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityRecommendController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/AgentInfoController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/AgentInfoController.class
deleted file mode 100644
index 5f8fb5c..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/AgentInfoController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/AgreementController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/AgreementController.class
deleted file mode 100644
index b8b4612..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/AgreementController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/AlipayController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/AlipayController.class
deleted file mode 100644
index 65c6bcb..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/AlipayController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/AliyunController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/AliyunController.class
deleted file mode 100644
index 3ca49bd..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/AliyunController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/AppMenuController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/AppMenuController.class
deleted file mode 100644
index 5f0e3e0..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/AppMenuController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/BankCardController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/BankCardController.class
deleted file mode 100644
index e534eed..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/BankCardController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/BannerController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/BannerController.class
deleted file mode 100644
index c39ffc5..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/BannerController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/BestNewActivityController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/BestNewActivityController.class
deleted file mode 100644
index 64dc9d1..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/BestNewActivityController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/CashAccountController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/CashAccountController.class
deleted file mode 100644
index 12258cd..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/CashAccountController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/CashController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/CashController.class
deleted file mode 100644
index 420fa27..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/CashController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceController.class
deleted file mode 100644
index 19811f1..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceGoodsController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceGoodsController.class
deleted file mode 100644
index 46ba392..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceGoodsController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceMerchantBuyController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceMerchantBuyController.class
deleted file mode 100644
index 7016db9..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceMerchantBuyController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceMerchantBuyDetailController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceMerchantBuyDetailController.class
deleted file mode 100644
index 8397865..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceMerchantBuyDetailController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceSignUnbindController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceSignUnbindController.class
deleted file mode 100644
index d145e79..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceSignUnbindController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/FansConsumReturnController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/FansConsumReturnController.class
deleted file mode 100644
index aba3751..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/FansConsumReturnController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/FansController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/FansController.class
deleted file mode 100644
index 2c5a5a2..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/FansController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/HelpVideoController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/HelpVideoController.class
deleted file mode 100644
index fe85643..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/HelpVideoController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/HomePageController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/HomePageController.class
deleted file mode 100644
index 6300e26..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/HomePageController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/IdcardController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/IdcardController.class
deleted file mode 100644
index 4508b9f..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/IdcardController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/IntroduceController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/IntroduceController.class
deleted file mode 100644
index 24693ea..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/IntroduceController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/LeshuaMakeMoneyController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/LeshuaMakeMoneyController.class
deleted file mode 100644
index 3a38150..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/LeshuaMakeMoneyController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/LevelController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/LevelController.class
deleted file mode 100644
index 4fd0f97..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/LevelController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MainPageController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MainPageController.class
deleted file mode 100644
index 84ebee1..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MainPageController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MccInfoController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MccInfoController.class
deleted file mode 100644
index 69617d4..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MccInfoController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MccInfoSortController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MccInfoSortController.class
deleted file mode 100644
index d65fa1f..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MccInfoSortController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MemberOrderController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MemberOrderController.class
deleted file mode 100644
index e5a863c..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MemberOrderController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MemberSettingController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MemberSettingController.class
deleted file mode 100644
index 42a21fe..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MemberSettingController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantAddressController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantAddressController.class
deleted file mode 100644
index a216b15..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantAddressController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantBankCardController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantBankCardController.class
deleted file mode 100644
index f4100e6..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantBankCardController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantBaseInfoController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantBaseInfoController.class
deleted file mode 100644
index 0624bdd..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantBaseInfoController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantDeviceController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantDeviceController.class
deleted file mode 100644
index 6ad5128..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantDeviceController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantGuideController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantGuideController.class
deleted file mode 100644
index 7199a90..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantGuideController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantImageController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantImageController.class
deleted file mode 100644
index 524cb6e..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantImageController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantIncomeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantIncomeController.class
deleted file mode 100644
index bbb8bd2..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantIncomeController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberComsumeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberComsumeController.class
deleted file mode 100644
index 8ade5bf..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberComsumeController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberController.class
deleted file mode 100644
index ae1f9f2..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberRechargeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberRechargeController.class
deleted file mode 100644
index 036c77c..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberRechargeController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMoveRecordsController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMoveRecordsController.class
deleted file mode 100644
index 1327d55..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMoveRecordsController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantOrderController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantOrderController.class
deleted file mode 100644
index 5b4c59e..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantOrderController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantProfitController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantProfitController.class
deleted file mode 100644
index a1c8931..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantProfitController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantQrCodeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantQrCodeController.class
deleted file mode 100644
index e2dfc12..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantQrCodeController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRateController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRateController.class
deleted file mode 100644
index ab0b8bb..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRateController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRateRecordController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRateRecordController.class
deleted file mode 100644
index 1a05f3b..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRateRecordController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRegistAuditRecordController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRegistAuditRecordController.class
deleted file mode 100644
index ecd059c..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRegistAuditRecordController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRegistLogController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRegistLogController.class
deleted file mode 100644
index 9884d20..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRegistLogController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantScanQrCodeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantScanQrCodeController.class
deleted file mode 100644
index c14a2fe..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantScanQrCodeController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantStaffController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantStaffController.class
deleted file mode 100644
index f9a5f51..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantStaffController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantStoreController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantStoreController.class
deleted file mode 100644
index f8a3323..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantStoreController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/NewAreaController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/NewAreaController.class
deleted file mode 100644
index 346939c..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/NewAreaController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticeController.class
deleted file mode 100644
index 69c0fd9..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticeController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticePageController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticePageController.class
deleted file mode 100644
index 780549a..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticePageController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticeReadRecordController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticeReadRecordController.class
deleted file mode 100644
index e6a5813..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticeReadRecordController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class
deleted file mode 100644
index 9873da3..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/PushController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/PushController.class
deleted file mode 100644
index 7c82d8f..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/PushController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/QuestionsAnswersController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/QuestionsAnswersController.class
deleted file mode 100644
index 7b58fe5..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/QuestionsAnswersController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/RealFansController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/RealFansController.class
deleted file mode 100644
index 447e6fb..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/RealFansController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/SpreadController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/SpreadController.class
deleted file mode 100644
index 7eaad03..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/SpreadController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/SuggestController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/SuggestController.class
deleted file mode 100644
index a3d066e..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/SuggestController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/SxfMccInfoController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/SxfMccInfoController.class
deleted file mode 100644
index b3d05a6..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/SxfMccInfoController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/SystemConfigController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/SystemConfigController.class
deleted file mode 100644
index a71eb6b..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/SystemConfigController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/SystemInfoController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/SystemInfoController.class
deleted file mode 100644
index 95010b5..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/SystemInfoController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/TestController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/TestController.class
deleted file mode 100644
index 0e4a9f3..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/TestController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/UploadImageController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/UploadImageController.class
deleted file mode 100644
index bd7df45..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/UploadImageController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController$1.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController$1.class
deleted file mode 100644
index 98a8267..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController$1.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController.class
deleted file mode 100644
index d70aec8..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserInfoController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/UserInfoController.class
deleted file mode 100644
index 4a79066..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserInfoController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserLevelController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/UserLevelController.class
deleted file mode 100644
index d20918a..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserLevelController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserOrganController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/UserOrganController.class
deleted file mode 100644
index 95999c0..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserOrganController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserPushIdController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/UserPushIdController.class
deleted file mode 100644
index 643e5f3..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserPushIdController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserVoiceController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/UserVoiceController.class
deleted file mode 100644
index d0fee5c..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserVoiceController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/WxBankCodeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/WxBankCodeController.class
deleted file mode 100644
index 7db730e..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/WxBankCodeController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/WxCityInfoController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/WxCityInfoController.class
deleted file mode 100644
index 1d02fc5..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/WxCityInfoController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/address/UserAddressController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/address/UserAddressController.class
deleted file mode 100644
index 861a9ba..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/address/UserAddressController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/bill/BillStatisticsController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/bill/BillStatisticsController.class
deleted file mode 100644
index 75edc98..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/bill/BillStatisticsController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/common/CustomErrorController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/common/CustomErrorController.class
deleted file mode 100644
index a5767c5..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/common/CustomErrorController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/common/ImageUploadController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/common/ImageUploadController.class
deleted file mode 100644
index cb74134..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/common/ImageUploadController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/device/DeviceStockController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/device/DeviceStockController.class
deleted file mode 100644
index 10052c1..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/device/DeviceStockController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/device/DeviceTransferController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/device/DeviceTransferController.class
deleted file mode 100644
index 77d40c0..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/device/DeviceTransferController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/device/MercOrderExpressController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/device/MercOrderExpressController.class
deleted file mode 100644
index 00d7b1c..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/device/MercOrderExpressController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/jft/JftAuditController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/jft/JftAuditController.class
deleted file mode 100644
index 5739d8b..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/jft/JftAuditController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/jft/JftController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/jft/JftController.class
deleted file mode 100644
index dd38745..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/jft/JftController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/level/TeamLevelController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/level/TeamLevelController.class
deleted file mode 100644
index 4e83775..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/level/TeamLevelController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/logist/LogistCallbackController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/logist/LogistCallbackController.class
deleted file mode 100644
index 1676ddd..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/logist/LogistCallbackController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MakeMoneyController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MakeMoneyController.class
deleted file mode 100644
index 74a37e8..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MakeMoneyController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MercAuthController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MercAuthController.class
deleted file mode 100644
index 54a4dc8..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MercAuthController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MercMemberSetController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MercMemberSetController.class
deleted file mode 100644
index 761b77e..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MercMemberSetController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchAuditController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchAuditController.class
deleted file mode 100644
index b262410..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchAuditController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.class
deleted file mode 100644
index ca4575f..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.class
deleted file mode 100644
index fcb1860..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantPluginController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantPluginController.class
deleted file mode 100644
index 708385d..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantPluginController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantRateNewController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantRateNewController.class
deleted file mode 100644
index fb66b5b..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantRateNewController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/WxCertController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/WxCertController.class
deleted file mode 100644
index 6269f12..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/WxCertController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/WxController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/WxController.class
deleted file mode 100644
index 38381ae..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/WxController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.class
deleted file mode 100644
index 83e0578..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/MachineCallbackController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/MachineCallbackController.class
deleted file mode 100644
index f3fd56d..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/MachineCallbackController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/WxCertCallbackController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/WxCertCallbackController.class
deleted file mode 100644
index b788331..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/WxCertCallbackController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercOrderDetailController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercOrderDetailController.class
deleted file mode 100644
index 506f140..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercOrderDetailController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercOrderNewController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercOrderNewController.class
deleted file mode 100644
index 92789ef..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercOrderNewController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercShopTrolleyController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercShopTrolleyController.class
deleted file mode 100644
index a05c143..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercShopTrolleyController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/store/PostageConfigController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/store/PostageConfigController.class
deleted file mode 100644
index a203fee..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/store/PostageConfigController.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/interceptor/TokenRegistryInterceptor.class b/pluss-api-page/target/classes/cn/pluss/platform/interceptor/TokenRegistryInterceptor.class
deleted file mode 100644
index 5dcfd7d..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/interceptor/TokenRegistryInterceptor.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/mapper/ImgReflectMapper.class b/pluss-api-page/target/classes/cn/pluss/platform/mapper/ImgReflectMapper.class
deleted file mode 100644
index d6dfa4c..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/mapper/ImgReflectMapper.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/mapper/SpreadMapper.class b/pluss-api-page/target/classes/cn/pluss/platform/mapper/SpreadMapper.class
deleted file mode 100644
index 6063e23..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/mapper/SpreadMapper.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/mapper/TestMapper.class b/pluss-api-page/target/classes/cn/pluss/platform/mapper/TestMapper.class
deleted file mode 100644
index 3602649..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/mapper/TestMapper.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/service/agent/AgentStaffService.class b/pluss-api-page/target/classes/cn/pluss/platform/service/agent/AgentStaffService.class
deleted file mode 100644
index 8283f17..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/service/agent/AgentStaffService.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/service/agent/MerchantRateApiService.class b/pluss-api-page/target/classes/cn/pluss/platform/service/agent/MerchantRateApiService.class
deleted file mode 100644
index b57620e..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/service/agent/MerchantRateApiService.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/service/agent/impl/AgentStaffServiceImpl.class b/pluss-api-page/target/classes/cn/pluss/platform/service/agent/impl/AgentStaffServiceImpl.class
deleted file mode 100644
index bbabbda..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/service/agent/impl/AgentStaffServiceImpl.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/service/agent/impl/MerchantRateServiceApiImpl.class b/pluss-api-page/target/classes/cn/pluss/platform/service/agent/impl/MerchantRateServiceApiImpl.class
deleted file mode 100644
index 2b09130..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/service/agent/impl/MerchantRateServiceApiImpl.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/service/common/SpreadService.class b/pluss-api-page/target/classes/cn/pluss/platform/service/common/SpreadService.class
deleted file mode 100644
index a1b18dc..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/service/common/SpreadService.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/service/common/impl/SpreadServiceImpl.class b/pluss-api-page/target/classes/cn/pluss/platform/service/common/impl/SpreadServiceImpl.class
deleted file mode 100644
index f8f04e1..0000000
Binary files a/pluss-api-page/target/classes/cn/pluss/platform/service/common/impl/SpreadServiceImpl.class and /dev/null differ
diff --git a/pluss-api-page/target/classes/log4j2-dev.xml b/pluss-api-page/target/classes/log4j2-dev.xml
deleted file mode 100644
index 0932fdd..0000000
--- a/pluss-api-page/target/classes/log4j2-dev.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
-<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
-<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
-<configuration status="WARN" monitorInterval="30">
-    <!--先定义所有的appender-->
-    <appenders>
-        <!--这个输出控制台的配置-->
-        <console name="Console" target="SYSTEM_OUT">
-            <!--输出日志的格式-->
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p - %c{1.} - %m%n"/>
-        </console>
-        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
-        <File name="log" fileName="${sys:user.home}/manage/logs/manage.log" append="false">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %c{1.} - %msg%xEx%n" />
-        </File>
-        <!--<File name="log" fileName="d:/crystal/logs/manage.log" append="false">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %class{36} %c - %msg%xEx%n" />
-        </File>-->
-        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
-        <RollingFile name="RollingFileInfo" fileName="${sys:user.home}/syb/logs/info.log"
-                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log">
-            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
-            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
-                <SizeBasedTriggeringPolicy size="100 MB"/>
-            </Policies>
-        </RollingFile>
-        <RollingFile name="RollingFileWarn" fileName="${sys:user.home}/syb/logs/warn.log"
-                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log">
-            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
-                <SizeBasedTriggeringPolicy size="100 MB"/>
-            </Policies>
-            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
-            <DefaultRolloverStrategy max="20"/>
-        </RollingFile>
-        <RollingFile name="RollingFileError" fileName="${sys:user.home}/syb/logs/error.log"
-                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log">
-            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
-                <SizeBasedTriggeringPolicy size="100 MB"/>
-            </Policies>
-        </RollingFile>
-    </appenders>
-    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
-    <loggers>
-        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
-        <logger name="cn.pluss.platform.mapper" level="DEBUG"></logger>
-        <logger name="cn.pluss.platform.ryx" level="DEBUG"></logger>
-        <logger name="cn.pluss.platform.ys" level="DEBUG"></logger>
-        <logger name="org.apache.http.impl.conn.PoolingHttpClientConnectionManager" level="INFO"></logger>
-
-        <root level="DEBUG">
-            <appender-ref ref="Console"/>
-            <appender-ref ref="RollingFileInfo"/>
-            <appender-ref ref="RollingFileWarn"/>
-            <appender-ref ref="RollingFileError"/>
-        </root>
-    </loggers>
-</configuration>
\ No newline at end of file
diff --git a/pluss-api-page/target/classes/log4j2-prod.xml b/pluss-api-page/target/classes/log4j2-prod.xml
deleted file mode 100644
index 41b9ecb..0000000
--- a/pluss-api-page/target/classes/log4j2-prod.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
-<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
-<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
-<configuration status="WARN" monitorInterval="30">
-    <!--先定义所有的appender-->
-    <appenders>
-        <!--这个输出控制台的配置-->
-        <console name="Console" target="SYSTEM_OUT">
-            <!--输出日志的格式-->
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p - %c{1.} - %m%n"/>
-        </console>
-        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
-        <File name="log" fileName="${sys:user.home}/manage/logs/manage.log" append="false">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %c{1.} - %msg%xEx%n" />
-        </File>
-        <!--<File name="log" fileName="d:/crystal/logs/manage.log" append="false">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %class{36} %c - %msg%xEx%n" />
-        </File>-->
-        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
-        <RollingFile name="RollingFileInfo" fileName="${sys:user.home}/syb/logs/info.log"
-                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log">
-            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
-            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
-                <SizeBasedTriggeringPolicy size="100 MB"/>
-            </Policies>
-        </RollingFile>
-        <RollingFile name="RollingFileWarn" fileName="${sys:user.home}/syb/logs/warn.log"
-                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log">
-            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
-                <SizeBasedTriggeringPolicy size="100 MB"/>
-            </Policies>
-            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
-            <DefaultRolloverStrategy max="20"/>
-        </RollingFile>
-        <RollingFile name="RollingFileError" fileName="${sys:user.home}/syb/logs/error.log"
-                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log">
-            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
-                <SizeBasedTriggeringPolicy size="100 MB"/>
-            </Policies>
-        </RollingFile>
-    </appenders>
-    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
-    <loggers>
-        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
-        <!--        <logger name="org.apache.shiro" level="INFO"></logger>-->
-        <!--        <logger name="org.springframework" level="INFO"></logger>-->
-        <!--        <logger name="com.baomidou.mybatisplus.core.MybatisConfiguration" level="INFO"></logger>-->
-        <!--        <logger name="com.baomidou.mybatisplus.core.MybatisConfiguration" level="INFO"></logger>-->
-        <!--        <logger name="com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean" level="INFO"></logger>-->
-        <!--        <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor" level="INFO"></logger>-->
-        <!--        <logger name="org.mybatis" level="INFO" ></logger>-->
-        <!--        <logger name="cn.pluss.platform.mapper" level="DEBUG"></logger>-->
-        <!--        <logger name="org.apache.http.wire" level="INFO"></logger>-->
-        <!--        <logger name="org.apache.http.headers" level="INFO"></logger>-->
-        <root level="INFO">
-            <appender-ref ref="Console"/>
-<!--            <appender-ref ref="RollingFileInfo"/>-->
-<!--            <appender-ref ref="RollingFileWarn"/>-->
-<!--            <appender-ref ref="RollingFileError"/>-->
-        </root>
-    </loggers>
-</configuration>
\ No newline at end of file
diff --git a/pluss-api-page/target/classes/mapper/ImgReflectMapper.xml b/pluss-api-page/target/classes/mapper/ImgReflectMapper.xml
deleted file mode 100644
index 3f3ac46..0000000
--- a/pluss-api-page/target/classes/mapper/ImgReflectMapper.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.pluss.platform.mapper.ImgReflectMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.ImgReflect">
-        <id column="id" property="id" />
-        <result column="localUrl" property="localUrl" />
-        <result column="ossUrl" property="ossUrl" />
-        <result column="createTime" property="createTime" />
-        <result column="updateTime" property="updateTime" />
-    </resultMap>
-
-    <select id="selectIdCardUrl" resultType="java.util.Map">
-        SELECT ic.id, ic.imgPositive, ic.imgNegative, ir.ossUrl imgPositiveOSS, ir2.ossUrl imgNegativeOSS
-        FROM tb_pluss_id_card ic
-        LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = ic.imgPositive
-        LEFT JOIN tb_pluss_img_reflect ir2 ON ir2.localUrl = ic.imgNegative
-        WHERE NOT ((
-            INSTR(imgPositive, "C:/") > 0
-            AND imgPositive IS NOT NULL
-        ) OR (
-            INSTR(imgNegative, "C:/") > 0
-            AND imgNegative IS NOT NULL
-        ))
-        AND NOT (INSTR(imgPositive, "https://syb-resource") > 0 AND INSTR(imgNegative, "https://syb-resource") > 0)
-        AND (ir.ossUrl IS NULL OR ir2.ossUrl IS NULL)
-    </select>
-
-    <select id="selectBankCardUrl" resultType="java.util.Map">
-        SELECT
-            bc.id,
-            bc.imgUrl,
-            ir.ossUrl imgUrlOSS
-        FROM
-            tb_pluss_bank_card bc
-            LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = bc.imgUrl
-        WHERE
-            NOT (
-                INSTR( bc.imgUrl, "C:/" ) > 0
-                AND bc.imgUrl IS NOT NULL
-            ) AND (
-                INSTR( bc.imgUrl, "https://syb-resource" ) = 0
-                AND bc.imgUrl IS NOT NULL
-                AND bc.imgUrl != ''
-            ) AND ir.ossUrl IS NULL
-        UNION
-        SELECT
-            bc.id,
-            bc.licenseUrl imgUrl,
-            ir.ossUrl imgUrlOSS
-        FROM
-            tb_pluss_bank_card bc
-            LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = bc.licenseUrl
-        WHERE
-            NOT (
-                INSTR( bc.licenseUrl, "C:/" ) > 0
-                AND bc.licenseUrl IS NOT NULL
-            )
-            AND (
-                INSTR( bc.licenseUrl, "https://syb-resource" ) = 0
-                AND bc.licenseUrl IS NOT NULL
-                AND bc.licenseUrl != ''
-            ) AND ir.ossUrl IS NULL
-    </select>
-
-    <select id="selectStoreImgUrl" resultType="java.util.Map">
-        SELECT
-            mi.id,
-            mi.picUrl imgUrl,
-            ir.ossUrl imgUrlOSS
-        FROM
-            tb_pluss_merchant_image mi
-            LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = mi.picUrl
-        WHERE
-            NOT (
-                INSTR( mi.picUrl, "C:/" ) > 0
-                AND mi.picUrl IS NOT NULL
-            ) AND (
-                INSTR( mi.picUrl, "https://syb-resource" ) = 0
-                AND mi.picUrl IS NOT NULL
-                AND mi.picUrl != ''
-            ) AND ir.ossUrl IS NULL
-    </select>
-
-    <select id="selectUserLogo" resultType="java.util.Map">
-        SELECT
-            ua.id,
-            ua.logo imgUrl,
-            ir.ossUrl imgUrlOSS
-        FROM
-            tb_pluss_user_app ua
-            LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = ua.logo
-        WHERE
-            NOT (
-                INSTR( ua.logo, "C:/" ) > 0
-                AND ua.logo IS NOT NULL
-            ) AND (
-                INSTR( ua.logo, "https://syb-resource" ) = 0
-                AND ua.logo IS NOT NULL
-                AND ua.logo != ''
-            ) AND ir.ossUrl IS NULL
-    </select>
-</mapper>
diff --git a/pluss-api-page/target/classes/mapper/SpreadMapper.xml b/pluss-api-page/target/classes/mapper/SpreadMapper.xml
deleted file mode 100644
index 59be78f..0000000
--- a/pluss-api-page/target/classes/mapper/SpreadMapper.xml
+++ /dev/null
@@ -1,523 +0,0 @@
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.pluss.platform.mapper.SpreadMapper">
-
-    <select id="selectDirectUser" resultType="cn.pluss.platform.entity.UserApp">
-        SELECT
-            ua.userId,
-            ua.parentId,
-            ui.loginName,
-            IFNULL(mr.rate, 38) rate,
-            ui.phone,
-            ua.userName,
-            ua.createDt,
-            mbi.alias,
-            ua.agentStaffId,
-            ua.`level`,
-            ua.`logo`,
-            mcs.remark auditReason,
-            IF (
-                (ua.bankStatus != 3 OR ua.bankStatus IS NULL), 1,
-                CASE mcs.`status`
-                WHEN '1' THEN IF(mcs.`thirdStatus` = '5', 6, 3)
-                WHEN '8' THEN 6
-                WHEN '2' THEN 4
-                WHEN '5' THEN 4
-                WHEN '3' THEN 5
-                WHEN '4' THEN 5
-                ELSE IF(mcs.`thirdStatus` = -100, 4, 2) END
-            ) `status`
-        FROM
-            tb_pluss_user_app ua
-        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
-        LEFT JOIN tb_pluss_user_info ui ON ui.id = ua.userId
-        LEFT JOIN tb_pluss_merchant_base_info mbi ON ua.merchantCode = mbi.merchantCode
-        LEFT JOIN
-                (
-                    SELECT mcs.merchantCode, mcs.remark, mcs.`status`, mcs.`thirdStatus` FROM tb_pluss_merchant_channel_status mcs
-                    LEFT JOIN (
-                        SELECT merchantCode, MAX(valid) maxValid, MIN(id) minId FROM tb_pluss_merchant_channel_status mcs
-                        GROUP BY merchantCode
-                    ) t ON mcs.merchantCode = t.merchantCode AND mcs.valid = t.maxValid
-                    WHERE (t.maxValid = 1) OR
-                    (t.maxValid = 0 AND t.minId = mcs.id)
-                ) mcs ON mcs.merchantCode = ua.merchantCode
-        <where>
-            ua.parentId = #{condition.userId}
-            AND LOCATE('@', ui.loginName) = 0
-            AND LENGTH(ui.loginName) = 11
-            <if test="condition.agentStaffIds != null and condition.agentStaffIds.size() > 0">
-                AND ua.agentStaffId IN
-                <foreach collection="condition.agentStaffIds" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="condition.alias != null and condition.alias != ''">
-                AND mbi.alias LIKE CONCAT('%', #{condition.alias}, '%')
-            </if>
-            <if test="condition.userName != null and condition.userName != ''">
-                AND ua.userName LIKE CONCAT('%', #{condition.userName}, '%')
-            </if>
-            <if test="condition.phone != null and condition.phone != ''">
-                AND ui.phone LIKE CONCAT('%', #{condition.phone}, '%')
-            </if>
-            <if test="condition.startTime != null and condition.startTime != ''">
-                AND ua.createDt &gt;= #{condition.startTime}
-            </if>
-            <if test="condition.endTime != null and condition.endTime != ''">
-                AND ua.createDt &lt; #{condition.endTime}
-            </if>
-            <if test="condition.status != null and condition.status != ''">
-                <choose>
-                    <when test='condition.status == "1"'>
-                        AND (
-                            ua.bankStatus != 3
-                            OR ua.bankStatus IS NULL
-                        )
-                    </when>
-                    <when test='condition.status == "3"'>
-                        AND mcs.`status` = '1'
-                    </when>
-                    <when test='condition.status == "4"'>
-                        AND (
-                            mcs.`status` = '2'
-                            OR (mcs.`status` = '0' AND mcs.`thirdStatus` != '-100')
-                            OR mcs.`status` = '5'
-                        )
-                    </when>
-                    <when test='condition.status == "5"'>
-                        AND (
-                            mcs.`status` = '3'
-                            OR mcs.`status` = '4'
-                        )
-                    </when>
-                    <when test='condition.status == "2"'>
-                        AND (
-                            ua.bankStatus = 3
-                            AND
-                            (
-                                mcs.`status` = '0'
-                                OR mcs.`status` IS NULL
-                            )
-                        )
-                    </when>
-                </choose>
-            </if>
-        </where>
-        ORDER BY ua.createDt DESC
-    </select>
-
-    <select id="selectPmtSubUser" resultType="cn.pluss.platform.entity.UserApp">
-        SELECT
-            ua.userId,
-            ui.loginName,
-            ua.parentId,
-            IFNULL(mr.rate, 38) rate,
-            ui.phone,
-            ua.userName,
-            ua.createDt,
-            mbi.alias,
-            ua.agentStaffId,
-            ua.`level`,
-            ua.`logo`,
-            mcs.remark auditReason,
-            IF (
-                (ua.bankStatus != 3 OR ua.bankStatus IS NULL), 1,
-                CASE mcs.`status`
-                WHEN '1' THEN IF(mcs.`thirdStatus` = '5', 6, 3)
-                WHEN '8' THEN 6
-                WHEN '2' THEN 4
-                WHEN '5' THEN 4
-                WHEN '3' THEN 5
-                WHEN '4' THEN 5
-                ELSE IF(mcs.`thirdStatus` = -100, 4, 2) END
-            ) `status`
-        FROM
-        (
-            (
-                SELECT ua1.userId
-                FROM tb_pluss_user_app ua
-                LEFT JOIN tb_pluss_user_app ua1
-                ON ua.userId = ua1.parentId
-                WHERE ua.parentId = #{condition.userId}
-            )
-            UNION
-            (
-                SELECT ua2.userId
-                FROM tb_pluss_user_app ua
-                LEFT JOIN tb_pluss_user_app ua1
-                ON ua.userId = ua1.parentId
-                LEFT JOIN tb_pluss_user_app ua2
-                ON ua1.userId = ua2.parentId
-                WHERE ua.parentId = #{condition.userId}
-            )
-        ) userIdList
-        LEFT JOIN tb_pluss_user_app ua ON ua.userId = userIdList.userId
-        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
-        LEFT JOIN tb_pluss_user_info ui ON ui.id = ua.userId
-        LEFT JOIN tb_pluss_merchant_base_info mbi ON ua.merchantCode = mbi.merchantCode
-        LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = ua.merchantCode
-        <where>
-            LOCATE('@', ui.loginName) = 0
-            AND LENGTH(ui.loginName) = 11
-            <if test="condition.agentStaffIds != null and condition.agentStaffIds.size() > 0">
-                AND ua.agentStaffId IN
-                <foreach collection="condition.agentStaffIds" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="condition.alias != null and condition.alias != ''">
-                AND mbi.alias LIKE CONCAT('%', #{condition.alias}, '%')
-            </if>
-            <if test="condition.userName != null and condition.userName != ''">
-                AND ua.userName LIKE CONCAT('%', #{condition.userName}, '%')
-            </if>
-            <if test="condition.phone != null and condition.phone != ''">
-                AND ui.phone LIKE CONCAT('%', #{condition.phone}, '%')
-            </if>
-            <if test="condition.startTime != null and condition.startTime != ''">
-                AND ua.createDt &gt;= #{condition.startTime}
-            </if>
-            <if test="condition.endTime != null and condition.endTime != ''">
-                AND ua.createDt &lt; #{condition.endTime}
-            </if>
-            <if test="condition.status != null and condition.status != ''">
-                <choose>
-                    <when test='condition.status == "1"'>
-                        AND (
-                            ua.bankStatus != 3
-                            OR ua.bankStatus IS NULL
-                        )
-                    </when>
-                    <when test='condition.status == "3"'>
-                        AND mcs.`status` = '1'
-                    </when>
-                    <when test='condition.status == "4"'>
-                        AND (
-                            mcs.`status` = '2'
-                            OR mcs.`status` = '5'
-                        )
-                    </when>
-                    <when test='condition.status == "5"'>
-                        AND (
-                            mcs.`status` = '3'
-                            OR mcs.`status` = '4'
-                        )
-                    </when>
-                    <when test='condition.status == "2"'>
-                        AND (
-                            ua.bankStatus = 3
-                            AND (
-                                mcs.`status` = '0'
-                                OR mcs.`status` IS NULL
-                            )
-                        )
-                    </when>
-                </choose>
-            </if>
-        </where>
-        ORDER BY ua.createDt DESC
-    </select>
-
-    <select id="selectAgentSubUser" resultType="cn.pluss.platform.entity.UserApp">
-        SELECT
-            ua.userId,
-            ua.parentId,
-            ui.loginName,
-            IFNULL(mr.rate, 38) rate,
-            ui.phone,
-            ua.userName,
-            ua.createDt,
-            mbi.alias,
-            ua.agentStaffId,
-            ua.`level`,
-            ua.`logo`,
-            mcs.remark auditReason,
-            IF (
-                (ua.bankStatus != 3 OR ua.bankStatus IS NULL), 1,
-                CASE mcs.`status`
-                WHEN '1' THEN 3
-                WHEN '2' THEN 4
-                WHEN '3' THEN 5
-                ELSE 2 END
-            ) `status`
-        FROM
-        (
-            (
-                SELECT ua1.userId
-                FROM tb_pluss_user_app ua
-                LEFT JOIN tb_pluss_user_app ua1
-                ON ua.userId = ua1.parentId
-                WHERE ua.parentId = #{condition.userId}
-                AND ua.userType = 'agent'
-                AND LOCATE(#{condition.userId}, ua.pIdArr ) > 0
-            )
-            UNION
-            (
-                SELECT ua1.userId
-                FROM tb_pluss_user_app ua
-                LEFT JOIN tb_pluss_user_app ua1
-                ON ua.userId = ua1.parentId
-                WHERE ua.parentId = #{condition.userId}
-                AND ua.userType = 'promoter'
-            )
-            UNION
-            (
-                SELECT ua2.userId
-                FROM tb_pluss_user_app ua
-                LEFT JOIN tb_pluss_user_app ua1
-                ON ua.userId = ua1.parentId
-                LEFT JOIN tb_pluss_user_app ua2
-                ON ua1.userId = ua2.parentId
-                WHERE ua.parentId = #{condition.userId}
-                AND ua.userType = 'promoter'
-            )
-        ) userIdList
-        LEFT JOIN tb_pluss_user_app ua ON ua.userId = userIdList.userId
-        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
-        LEFT JOIN tb_pluss_user_info ui ON ui.id = ua.userId
-        LEFT JOIN tb_pluss_merchant_base_info mbi ON ua.merchantCode = mbi.merchantCode
-        LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = ua.merchantCode
-        <where>
-            LOCATE('@', ui.loginName) = 0
-            AND LENGTH(ui.loginName) = 11
-            <if test="condition.agentStaffIds != null and condition.agentStaffIds.size() > 0">
-                AND ua.agentStaffId IN
-                <foreach collection="condition.agentStaffIds" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="condition.alias != null and condition.alias != ''">
-                AND mbi.alias LIKE CONCAT('%', #{condition.alias}, '%')
-            </if>
-            <if test="condition.userName != null and condition.userName != ''">
-                AND ua.userName LIKE CONCAT('%', #{condition.userName}, '%')
-            </if>
-            <if test="condition.phone != null and condition.phone != ''">
-                AND ui.phone LIKE CONCAT('%', #{condition.phone}, '%')
-            </if>
-            <if test="condition.startTime != null and condition.startTime != ''">
-                AND ua.createDt &gt;= #{condition.startTime}
-            </if>
-            <if test="condition.endTime != null and condition.endTime != ''">
-                AND ua.createDt &lt; #{condition.endTime}
-            </if>
-            <if test="condition.status != null and condition.status != ''">
-                <choose>
-                    <when test='condition.status == "1"'>
-                        AND (
-                            ua.bankStatus != 3
-                            OR ua.bankStatus IS NULL
-                        )
-                    </when>
-                    <when test='condition.status == "3"'>
-                        AND mcs.`status` = '1'
-                    </when>
-                    <when test='condition.status == "4"'>
-                        AND (
-                            mcs.`status` = '2'
-                            OR mcs.`status` = '5'
-                        )
-                    </when>
-                    <when test='condition.status == "5"'>
-                        AND (
-                            mcs.`status` = '3'
-                            OR mcs.`status` = '4'
-                        )
-                    </when>
-                    <when test='condition.status == "2"'>
-                        AND (
-                            ua.bankStatus = 3
-                            AND (
-                                mcs.`status` = '0'
-                                OR mcs.`status` IS NULL
-                            )
-                        )
-                    </when>
-                </choose>
-            </if>
-        </where>
-        ORDER BY ua.createDt DESC
-    </select>
-
-    <!-- 查询团队交易数据 -->
-    <select id="userTemaAchiePage" resultType="cn.pluss.platform.vo.UserTeamAchieVO">
-        SELECT
-        <choose>
-            <when test="condition.dataType == null or condition.dataType == 1">
-                <if test="condition.dateType == null or condition.dateType == 1">
-                    SUM(ownTransFlow) as tradeAmt ,SUM(transNum) as tradeNum,profitDate as `date`,userId, 1 as dateType
-                </if>
-                <if test="condition.dateType == 2">
-                    SUM(ownTransFlow) as tradeAmt,SUM(transNum) as tradeNum,profitMonth as `date`,userId,2 as dateType
-                </if>
-                <if test="condition.dateType == 3">
-                    SUM(ownTransFlow) as tradeAmt,SUM(transNum) as tradeNum,DATE_FORMAT(profitDate,'%Y') as `date`,userId,3 as dateType
-                </if>
-            </when>
-            <otherwise>
-                <if test="condition.dateType == null or condition.dateType == 1">
-                    (teamTransFlow) as tradeAmt ,transNum as tradeNum,profitDate as `date`,userId, 1 as dateType
-                </if>
-                <if test="condition.dateType == 2">
-                    SUM(teamTransFlow) as tradeAmt,SUM(transNum) as tradeNum,profitMonth as `date`,userId,2 as dateType
-                </if>
-                <if test="condition.dateType == 3">
-                    SUM(teamTransFlow) as tradeAmt,SUM(transNum) as tradeNum,DATE_FORMAT(profitDate,'%Y') as `date`,userId,3 as dateType
-                </if>
-            </otherwise>
-        </choose>
-
-        from  tb_pluss_user_profit where
-        <choose>
-            <when test="condition.dataType == null or condition.dataType == 1">
-                parentId = #{condition.userId} and  ownTransFlow != 0 and teamTransFlow = 0
-            </when>
-            <otherwise>
-                userId = #{condition.userId}
-            </otherwise>
-        </choose>
-        <if test="condition.dateType == null or condition.dateType == 1">
-            group by profitDate
-        </if>
-        <if test="condition.dateType == 2">
-            group by profitMonth
-        </if>
-        <if test="condition.dateType == 3">
-            group by DATE_FORMAT(profitDate,'%Y')
-        </if>
-        order by
-        <if test="condition.dateType == null or condition.dateType == 1">
-             profitDate
-        </if>
-        <if test="condition.dateType == 2">
-             profitMonth
-        </if>
-        <if test="condition.dateType == 3">
-             DATE_FORMAT(profitDate,'%Y')
-        </if>
-        desc
-
-    </select>
-
-    <select id="selectTodaySpreadData" resultType="cn.pluss.platform.vo.SpreadData">
-        SELECT
-            IFNULL(SUM(IF(mo.`status` = 1, mo.consumeFee, IF(mo.`status` = 2, -mo.consumeFee, 0))), 0.00) ownAmt,
-            COUNT(DISTINCT IF(mo.`status` = 1, mo.orderNumber, 0)) ownBillCount,
-            COUNT(DISTINCT IF(mo.`status` = 1 || mo.`status` = 2, mo.merchantCode, 0)) ownActiveCount,
-            COUNT(DISTINCT IF(ua.createDt > CURRENT_DATE, ua.userId, 0)) ownNewCount,
-            CURRENT_DATE date
-        FROM tb_pluss_user_app ua
-             LEFT JOIN tb_pluss_user_app sua ON ua.userId = sua.parentId
-             LEFT JOIN tb_pluss_merchant_order mo ON mo.merchantCode = ua.merchantCode AND mo.createDate = CURRENT_DATE
-        WHERE ua.parentId = #{userId} AND ua.userType = 'promoter' AND ua.userType = 'promoter'
-    </select>
-
-    <select id="pageDaySpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
-        SELECT startDate date, COUNT(DISTINCT IF(createDate &lt;= startDate, merchantCode, NULL)) ownActiveCount
-                , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) ownNewCount
-                , SUM(amount) ownAmt, SUM(count) ownBillCount
-        FROM (
-            SELECT DISTINCT DATE_FORMAT(ua.createDt, '%Y-%m-%d') createDate, ua.merchantCode, ua.userId, mbs.amount, mbs.count, mbs.startDate
-            FROM tb_pluss_user_app ua
-            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
-            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
-            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
-        ) t  GROUP BY startDate
-    </select>
-
-    <select id="pageMonthSpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
-        SELECT startDate month, COUNT(DISTINCT IF(createDate &lt;= startDate, merchantCode, NULL)) ownActiveCount, SUM(amount) ownAmt, SUM(count) ownBillCount
-                              , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) ownNewCount
-        FROM (
-            SELECT DISTINCT DATE_FORMAT(ua.createDt, '%Y-%m') createDate, ua.merchantCode, ua.userId, mbs.amount, mbs.count, DATE_FORMAT(mbs.startDate, '%Y-%m') startDate
-            FROM tb_pluss_user_app ua
-            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
-            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
-            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
-        ) t  GROUP BY startDate
-    </select>
-
-    <select id="pageYearSpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
-        SELECT startDate year, COUNT(DISTINCT IF(createDate &lt;= startDate, merchantCode, NULL)) ownActiveCount, SUM(amount) ownAmt, SUM(count) ownBillCount
-                             , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) ownNewCount
-        FROM (
-            SELECT DISTINCT DATE_FORMAT(ua.createDt, '%Y') createDate, ua.merchantCode, ua.userId, mbs.amount, mbs.count, DATE_FORMAT(mbs.startDate, '%Y') startDate
-            FROM tb_pluss_user_app ua
-            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
-            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
-            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
-            ) t  GROUP BY startDate
-    </select>
-
-    <select id="pageTeamDaySpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
-        SELECT startDate date, COUNT(DISTINCT IF(createDate &lt; startDate, merchantCode, NULL)) teamActiveCount, SUM(amount) teamAmt, SUM(count) teamBillCount
-                            , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) teamNewCount
-        FROM (
-            SELECT DISTINCT DATE_FORMAT(ua2.createDt, '%Y-%m-%d') createDate, ua2.merchantCode, ua2.userId, mbs.amount, mbs.count, mbs.startDate FROM tb_pluss_user_app ua
-            LEFT JOIN tb_pluss_user_app ua2 ON ua2.parentId = ua.userId
-            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
-            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
-            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
-        ) t  GROUP BY startDate
-    </select>
-
-    <select id="pageTeamMonthSpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
-        SELECT startDate month, COUNT(DISTINCT IF(createDate &lt; startDate, merchantCode, NULL)) teamActiveCount, SUM(amount) teamAmt, SUM(count) teamBillCount
-                              , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) teamNewCount
-        FROM (
-            SELECT DISTINCT DATE_FORMAT(ua2.createDt, '%Y-%m') createDate, ua2.merchantCode, ua2.userId, mbs.amount, mbs.count, DATE_FORMAT(mbs.startDate, '%Y-%m') startDate
-            FROM tb_pluss_user_app ua
-            LEFT JOIN tb_pluss_user_app ua2 ON ua2.parentId = ua.userId
-            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
-            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
-            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
-            ) t  GROUP BY startDate
-    </select>
-
-    <select id="pageTeamYearSpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
-        SELECT startDate year, COUNT(DISTINCT IF(createDate &lt; startDate, merchantCode, NULL)) teamActiveCount, SUM(amount) teamAmt, SUM(count) teamBillCount
-                             , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) teamNewCount
-        FROM (
-            SELECT DISTINCT DATE_FORMAT(ua2.createDt, '%Y') createDate, ua2.merchantCode, ua2.userId, mbs.amount, mbs.count, DATE_FORMAT(mbs.startDate, '%Y') startDate
-            FROM tb_pluss_user_app ua
-            LEFT JOIN tb_pluss_user_app ua2 ON ua2.parentId = ua.userId
-            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
-            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
-            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
-            ) t  GROUP BY startDate
-    </select>
-
-    <select id="getAppUserTeanFlow" parameterType="cn.pluss.platform.vo.UserTeamAchieVO" resultType="cn.pluss.platform.vo.UserTeamAchieVO">
-        SELECT
-        <choose>
-            <when test="dataType == null or dataType == 1">
-                SUM(ownTransFlow) as tradeAmt,SUM(transNum) as tradeNum
-            </when>
-            <otherwise>
-                SUM(teamTransFlow) as tradeAmt ,SUM(transNum) as tradeNum
-            </otherwise>
-        </choose>
-        from  tb_pluss_user_profit
-        where
-        <choose>
-            <when test="dataType == null or dataType == 1">
-                parentId = #{userId} and  ownTransFlow != 0 and teamTransFlow = 0
-            </when>
-            <otherwise>
-                userId = #{userId}
-            </otherwise>
-        </choose>
-        <if test="dateType == null or dateType == 1">
-            and profitDate = #{date}
-        </if>
-        <if test="dateType == 2">
-            and profitMonth = #{date}
-        </if>
-        <if test="dateType == 3">
-            and DATE_FORMAT(profitDate,'%Y') = #{date}
-        </if>
-    </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/pluss-common-bundle/pluss-common-bundle.iml b/pluss-common-bundle/pluss-common-bundle.iml
index afb03de..838c2c2 100644
--- a/pluss-common-bundle/pluss-common-bundle.iml
+++ b/pluss-common-bundle/pluss-common-bundle.iml
@@ -35,6 +35,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GetuiConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GetuiConfig.java
index dcaf68a..39ac18d 100644
--- a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GetuiConfig.java
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GetuiConfig.java
@@ -11,7 +11,7 @@ import javax.annotation.PostConstruct;
 @PropertySource("classpath:config/application-common.yml")
 public class GetuiConfig {
 
-    public String domain = "https://restapi.getui.com/v2/lcpLtzlX1IAVVHaMzO7rI9";
+    public String domain = "https://restapi.getui.com/v2/jzSkfM0Wsk8uSDL2zwGu07";
 
     public static String token = null;
 
diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml
index 55ac404..15023e4 100644
--- a/pluss-common-bundle/src/main/resources/config/application-common.yml
+++ b/pluss-common-bundle/src/main/resources/config/application-common.yml
@@ -146,4 +146,4 @@ sxf:
 
 getui:
   domain: https://restapi.getui.com/v2/${getui.appId}
-  appId:
+  appId: jzSkfM0Wsk8uSDL2zwGu07
diff --git a/pluss-common-bundle/target/classes/config/application-common.yml b/pluss-common-bundle/target/classes/config/application-common.yml
deleted file mode 100644
index 30eb008..0000000
--- a/pluss-common-bundle/target/classes/config/application-common.yml
+++ /dev/null
@@ -1,149 +0,0 @@
-juhe:
-  send:
-    url: http://v.juhe.cn/sms/send
-    key: aeb2ea1a00cc46551aa93503ae9db7b1
-
-ip138:
-  url: https://api.ip138.com/ipv4/
-  token: 获取token
-
-aliyun:
-  # 这里推荐使用RAM账号信息 #
-  keyid: LTAI5tMLHwnM1zYYAFuRa1fK
-  keysecret: jS1h2STq1vcODczDNFQkjcU6ODyYAj
-  region-id: cn-hangzhou
-  sts:
-    role-arn:
-    endpoint: https://sts.cn-hangzhou.aliyuncs.com
-  oss:
-    endpoint: https://oss-cn-hangzhou.aliyuncs.com
-    bucketname: czg-oss
-    callback: ${parameter.domain}/manage/upload/ossCallback
-  bankcard:
-    #旧地址  https://aliyun-bankcard4-verify.apistore.cn/bank4
-    bank-url: https://aliyun-bankcard4-verify.apistore.cn/bank4
-    app-code: 11cb746de2704f5482a40fd36ed2sg6u
-    SceneId: 3931001
-
-#阿里MQTT参数配置
-mqtt:
-  region-id: cn-hangzhou
-  keyid:
-  keysecret:
-  instance-id:
-  topic:
-  groupid:
-#  druid连接池基本配置 #
-spring:
-  mail:
-    default-encoding: utf-8
-    host: smtp.exmail.qq.com
-    port: 465
-    nickname: 发送报表邮件的昵称
-    username: 发送报表右键的邮箱
-    password:
-    properties:
-      mail:
-        smtp:
-          starttls:
-            enable: true
-            required: true
-          ssl:
-            enable: true
-            socketFactory:
-              fallback: false
-              class: com.fintech.modules.base.util.mail.MailSSLSocketFactory
-
-  #    username: 1317450073@qq.com
-  #    password: ldbidwgegkwtjcca
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
-      filters: stat, wall
-      filter:
-        stat:
-          log-slow-sql: true
-          slow-sql-millis: 1000
-        wall:
-          config:
-            multi-statement-allow: true
-            none-base-statement-allow: true
-          enabled: true
-      initial-size: 5
-      max-active: 20
-      max-pool-prepared-statement-per-connection-size: 20
-      max-wait: 60000
-      min-evictable-idle-time-millis: 30000
-      min-idle: 5
-      test-on-borrow: false
-      test-on-return: false
-      test-while-idle: true
-      time-between-eviction-runs-millis: 60000
-      use-global-data-source-stat: true
-      validation-query: select 'x'
-
-  rabbitmq:
-    username:
-    password:
-    host:
-    port: 5672
-
-parameter:
-  # 124.114.74.203本机ip
-  domain: http://60.205.224.68
-  ALI_APP_AUTH_TOKEN: ${parameter.domain}/wap/aliPay/index
-  ALI_APP_ID: 支付宝原生接入的APPID
-  ALI_RATE: 0.006
-  ALI_RETURN_URL: ${parameter.domain}/wap/aliPay/returnUrl
-  APPID: wx7f982bbf66000fd1
-  APPLETS_APPID: 小程序付款APPID
-  APPSECRET:
-  KEY: 微信原生加密用的KEY
-  LESHUALIU: 乐刷、未接入可不管
-  LESHUA_API:
-  MERCHANT_APPID:
-  MERCHANT_APPSECRET:
-  MERCHANT_KEY:
-  MERCHANT_PID:
-  PID:
-  PRI:
-  PUB:
-  REPLACE: /home/syb
-  WECHAT_RATE:
-  ZY_ALI_APP_ID:
-  ZY_PRI:
-  ZY_PUB:
-  agentId: 乐刷代理商编号、未接入可不管
-  apk_dowload_url: apk下载链接，存储转入OSS之后可不管
-  baiduAK: LUcko8ZP334suBQ929nbrBtV
-  baiduSK: VqPHkWS5oipOEc2yw7dNa5CWr7yGIyiE
-  bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
-  blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
-  # 百度人脸识别应用的AK
-  baiduAK2: ASgPr1OxpI32E3G96rxWObuZ
-  # 百度人脸识别应用的SK
-  baiduSK2: 80aOspiFxTgGmcWZoTinwlOOjRT6IRPE
-  fans_profit: 4.0E-4
-  idCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
-  leshuaCallBackKey:
-  leshuapaykey:
-  leshuarate: 0.0038
-  upload_save_path: /czg/resources/images/upload
-  upload_visit_path: ${parameter.domain}/resources/images/upload
-  versions: 1
-  wechatCallback:
-  #商家公众号APPID
-  SJ_APPID:
-  #收银呗商家APPSECRET
-  SJ_APPSECRET:
-
-## 默认为正式环境
-sxf:
-  domain: https://openapi.tianquetech.com
-  orgId: "02668880"
-  publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjo1+KBcvwDSIo+nMYLeOJ19Ju4ii0xH66ZxFd869EWFWk/EJa3xIA2+4qGf/Ic7m7zi/NHuCnfUtUDmUdP0JfaZiYwn+1Ek7tYAOc1+1GxhzcexSJLyJlR2JLMfEM+rZooW4Ei7q3a8jdTWUNoak/bVPXnLEVLrbIguXABERQ0Ze0X9Fs0y/zkQFg8UjxUN88g2CRfMC6LldHm7UBo+d+WlpOYH7u0OTzoLLiP/04N1cfTgjjtqTBI7qkOGxYs6aBZHG1DJ6WdP+5w+ho91sBTVajsCxAaMoExWQM2ipf/1qGdsWmkZScPflBqg7m0olOD87ymAVP/3Tcbvi34bDfwIDAQAB
-
-getui:
-  domain: https://restapi.getui.com/v2/${getui.appId}
-  appId:
diff --git a/pluss-dao-bundle/pluss-dao-bundle.iml b/pluss-dao-bundle/pluss-dao-bundle.iml
index 8accd61..d0af604 100644
--- a/pluss-dao-bundle/pluss-dao-bundle.iml
+++ b/pluss-dao-bundle/pluss-dao-bundle.iml
@@ -35,6 +35,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/pluss-dao-bundle/src/main/resources/mapper/BestNewActivity-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/BestNewActivity-sqlmap.xml
index 5900be8..0b9cc7e 100644
--- a/pluss-dao-bundle/src/main/resources/mapper/BestNewActivity-sqlmap.xml
+++ b/pluss-dao-bundle/src/main/resources/mapper/BestNewActivity-sqlmap.xml
@@ -100,7 +100,7 @@
     <select id="queryBestNewActivityPage" parameterType="java.util.Map"
             resultType="cn.pluss.platform.entity.BestNewActivity">
         SELECT bna.*, IF(nrr.id IS NULL, 0, 1) readStatus from tb_pluss_best_new_activity bna
-            LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = bna.id
+            LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = bna.id AND nrr.type=3
             <if test="userId != null">
                 AND nrr.userId = #{userId}
             </if>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Notice-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Notice-sqlmap.xml
index 7ee9e36..50da2da 100644
--- a/pluss-dao-bundle/src/main/resources/mapper/Notice-sqlmap.xml
+++ b/pluss-dao-bundle/src/main/resources/mapper/Notice-sqlmap.xml
@@ -191,8 +191,8 @@
             IF ( nrr.id IS NULL, 0, 1 ) readStatus
         FROM
             tb_pluss_notice n
-        LEFT JOIN tb_pluss_notice_read_record nrr ON n.id = nrr.noticeId
-        AND nrr.userId = n.userId
+        LEFT JOIN tb_pluss_notice_read_record nrr ON n.id = nrr.noticeId AND nrr.type='2'
+        AND nrr.userId = #{userId}
         <where>
             <if test="id!= null">
                 and n.id = #{id}
diff --git a/pluss-dao-bundle/src/main/resources/mapper/NoticeReadRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/NoticeReadRecordMapper.xml
index 5a9121e..9b80bb1 100644
--- a/pluss-dao-bundle/src/main/resources/mapper/NoticeReadRecordMapper.xml
+++ b/pluss-dao-bundle/src/main/resources/mapper/NoticeReadRecordMapper.xml
@@ -22,9 +22,9 @@
 
     <insert id="updateNoticeRead">
         INSERT INTO tb_pluss_notice_read_record(`userId`, `type`, `noticeId`)
-        SELECT #{userId} `userId`, 2 `type`, n.id noticeId FROM tb_pluss_notice n
-            LEFT JOIN tb_pluss_notice_read_record nrr ON n.id = nrr.noticeId AND nrr.type = '2' AND (nrr.userId = n.userId OR n.userId = -1)
-        WHERE nrr.id IS NULL AND n.typeFirst = #{type} AND n.userId IN ("-1", #{userId})
+        SELECT #{userId},2 type, id FROM tb_pluss_notice
+        WHERE id NOT IN(SELECT noticeId FROM tb_pluss_notice_read_record WHERE type='2' AND userId=#{userId})
+        AND userId IN(-1,#{userId})
     </insert>
 
     <insert id="updateEventInfoRead">
@@ -43,10 +43,9 @@
     </select>
 
     <select id="selectNoticeCount" resultType="java.util.Map">
-        SELECT count(1) `count`, typeFirst `type` FROM tb_pluss_notice n
-         LEFT JOIN tb_pluss_notice_read_record nrr ON n.id = nrr.noticeId AND nrr.type = '2' AND (nrr.userId = n.userId OR n.userId = -1)
-        WHERE nrr.id IS NULL AND (n.userId = #{userId} OR n.userId = '-1')
-        GROUP BY n.typeFirst
+        SELECT COUNT(*) `count`,typeFirst `type` FROM tb_pluss_notice
+        WHERE id NOT IN(select noticeId from tb_pluss_notice_read_record WHERE type='2' and userId=#{userId})
+        AND userId IN(-1,#{userId}) GROUP BY typeFirst
     </select>
 
     <select id="selectArticleCount" resultType="java.util.Map">
diff --git a/pluss-manage-page/pluss-manage-page.iml b/pluss-manage-page/pluss-manage-page.iml
index dbdc04d..9ade217 100644
--- a/pluss-manage-page/pluss-manage-page.iml
+++ b/pluss-manage-page/pluss-manage-page.iml
@@ -37,6 +37,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -101,7 +103,6 @@
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
     <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.5.5" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
     <orderEntry type="library" name="Maven: cn.jpush.api:jiguang-common:1.1.12" level="project" />
     <orderEntry type="library" name="Maven: com.mob.push.sdk:mobpush-websdkv3-java:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.1.0.RELEASE" level="project" />
@@ -115,17 +116,6 @@
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.21" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
-    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
     <orderEntry type="library" name="Maven: xml-security:xmlsec:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.2" level="project" />
@@ -133,8 +123,6 @@
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.23" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.23" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.9.1" level="project" />
@@ -210,6 +198,25 @@
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.11" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.13" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.12" level="project" />
diff --git a/pluss-model-bundle/pluss-model-bundle.iml b/pluss-model-bundle/pluss-model-bundle.iml
index 65e4249..e7b9477 100644
--- a/pluss-model-bundle/pluss-model-bundle.iml
+++ b/pluss-model-bundle/pluss-model-bundle.iml
@@ -35,6 +35,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java
deleted file mode 100644
index fc34447..0000000
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cn.pluss.platform.converter;
-
-import cn.pluss.platform.dto.BankInfoDTO;
-import cn.pluss.platform.entity.BankCard;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-01-30T11:00:04+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
-)
-public class BankCardConverterImpl implements BankCardConverter {
-
-    @Override
-    public BankCard dto2Domain(BankInfoDTO bankInfoDTO) {
-        if ( bankInfoDTO == null ) {
-            return null;
-        }
-
-        BankCard bankCard = new BankCard();
-
-        bankCard.setUserId( bankInfoDTO.getUserId() );
-        bankCard.setBankCardNo( bankInfoDTO.getBankCardNo() );
-        bankCard.setBankName( bankInfoDTO.getBankName() );
-        bankCard.setBranchName( bankInfoDTO.getBranchName() );
-        bankCard.setAccountType( bankInfoDTO.getAccountType() );
-        bankCard.setContactLine( bankInfoDTO.getContactLine() );
-        bankCard.setBranchProvince( bankInfoDTO.getBranchProvince() );
-        bankCard.setBranchCity( bankInfoDTO.getBranchCity() );
-        bankCard.setBranchArea( bankInfoDTO.getBranchArea() );
-        bankCard.setBankAddressNo( bankInfoDTO.getBankAddressNo() );
-        bankCard.setPhone( bankInfoDTO.getPhone() );
-        bankCard.setImgUrl( bankInfoDTO.getImgUrl() );
-
-        return bankCard;
-    }
-}
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java
deleted file mode 100644
index 32b9524..0000000
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java
+++ /dev/null
@@ -1,1455 +0,0 @@
-package cn.pluss.platform.converter;
-
-import cn.pluss.platform.dto.AccountDTO;
-import cn.pluss.platform.dto.BankCardDTO;
-import cn.pluss.platform.dto.BankInfoDTO;
-import cn.pluss.platform.dto.DeviceStockDTO;
-import cn.pluss.platform.dto.MercTradeDataDTO;
-import cn.pluss.platform.dto.RegionReflectDTO;
-import cn.pluss.platform.entity.Account;
-import cn.pluss.platform.entity.BankCard;
-import cn.pluss.platform.entity.DeviceDetail;
-import cn.pluss.platform.entity.DeviceStock;
-import cn.pluss.platform.entity.IdCard;
-import cn.pluss.platform.entity.IpLocationCache;
-import cn.pluss.platform.entity.JftBankCard;
-import cn.pluss.platform.entity.JftMercBaseInfo;
-import cn.pluss.platform.entity.JftMercPaymentChannel;
-import cn.pluss.platform.entity.JftMerchantRate;
-import cn.pluss.platform.entity.JftMerchantRateRecord;
-import cn.pluss.platform.entity.JftReceiptInfo;
-import cn.pluss.platform.entity.MercMemberSet;
-import cn.pluss.platform.entity.MerchantCashPlaceStaff;
-import cn.pluss.platform.entity.MerchantChannelStatus;
-import cn.pluss.platform.entity.MerchantImage;
-import cn.pluss.platform.entity.MerchantRateNew;
-import cn.pluss.platform.entity.MerchantRateNewRecord;
-import cn.pluss.platform.entity.RegionReflect;
-import cn.pluss.platform.entity.UserApp;
-import cn.pluss.platform.entity.UserVoice;
-import cn.pluss.platform.vo.AccountVO;
-import cn.pluss.platform.vo.ChannelStatusVO;
-import cn.pluss.platform.vo.DeviceDetailVO;
-import cn.pluss.platform.vo.DeviceStockVO;
-import cn.pluss.platform.vo.JftMercBaseInfoVO;
-import cn.pluss.platform.vo.JftMercPaymentChannelVO;
-import cn.pluss.platform.vo.JftReceiptInfoVO;
-import cn.pluss.platform.vo.MercMemberSetVO;
-import cn.pluss.platform.vo.MerchantCashPlaceStaffVO;
-import cn.pluss.platform.vo.MerchantRateNewRecordVO;
-import cn.pluss.platform.vo.MerchantRateNewVO;
-import cn.pluss.platform.vo.UserAppVO;
-import com.alibaba.fastjson.JSONObject;
-import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-01-30T11:00:03+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
-)
-public class ConverterImpl implements Converter {
-
-    @Override
-    public MerchantCashPlaceStaffVO toVO(MerchantCashPlaceStaff cashPlaceStaff) {
-        if ( cashPlaceStaff == null ) {
-            return null;
-        }
-
-        MerchantCashPlaceStaffVO merchantCashPlaceStaffVO = new MerchantCashPlaceStaffVO();
-
-        merchantCashPlaceStaffVO.setId( cashPlaceStaff.getId() );
-        merchantCashPlaceStaffVO.setUserId( cashPlaceStaff.getUserId() );
-        merchantCashPlaceStaffVO.setCashPlaceId( cashPlaceStaff.getCashPlaceId() );
-        merchantCashPlaceStaffVO.setRemark( cashPlaceStaff.getRemark() );
-        merchantCashPlaceStaffVO.setStatus( cashPlaceStaff.getStatus() );
-        merchantCashPlaceStaffVO.setCreateTime( cashPlaceStaff.getCreateTime() );
-        merchantCashPlaceStaffVO.setCreateTimeStart( cashPlaceStaff.getCreateTimeStart() );
-        merchantCashPlaceStaffVO.setCreateTimeEnd( cashPlaceStaff.getCreateTimeEnd() );
-        merchantCashPlaceStaffVO.setUpdateTime( cashPlaceStaff.getUpdateTime() );
-        merchantCashPlaceStaffVO.setUpdateTimeStart( cashPlaceStaff.getUpdateTimeStart() );
-        merchantCashPlaceStaffVO.setUpdateTimeEnd( cashPlaceStaff.getUpdateTimeEnd() );
-
-        return merchantCashPlaceStaffVO;
-    }
-
-    @Override
-    public ChannelStatusVO toVO(MerchantChannelStatus entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        ChannelStatusVO channelStatusVO = new ChannelStatusVO();
-
-        channelStatusVO.setId( entity.getId() );
-        channelStatusVO.setChannel( entity.getChannel() );
-        channelStatusVO.setMerchantCode( entity.getMerchantCode() );
-        channelStatusVO.setMerchantId( entity.getMerchantId() );
-        channelStatusVO.setStatus( entity.getStatus() );
-        channelStatusVO.setAuthorizationStatus( entity.getAuthorizationStatus() );
-        channelStatusVO.setThirdStatus( entity.getThirdStatus() );
-        channelStatusVO.setRemark( entity.getRemark() );
-        channelStatusVO.setCreateTime( entity.getCreateTime() );
-        channelStatusVO.setUpdateTime( entity.getUpdateTime() );
-        channelStatusVO.setApplicationId( entity.getApplicationId() );
-        channelStatusVO.setCallbackStatus( entity.getCallbackStatus() );
-        channelStatusVO.setSettlementType( entity.getSettlementType() );
-        channelStatusVO.setSrcMerchantNo( entity.getSrcMerchantNo() );
-        channelStatusVO.setVirChannelFlag( entity.getVirChannelFlag() );
-        channelStatusVO.setUserId( entity.getUserId() );
-        JSONObject jSONObject = entity.getExtra();
-        if ( jSONObject != null ) {
-            channelStatusVO.setExtra( new JSONObject( jSONObject ) );
-        }
-        channelStatusVO.setValid( entity.getValid() );
-        channelStatusVO.setMercName( entity.getMercName() );
-
-        return channelStatusVO;
-    }
-
-    @Override
-    public RegionReflect toEntity(RegionReflectDTO dto) {
-        if ( dto == null ) {
-            return null;
-        }
-
-        RegionReflect regionReflect = new RegionReflect();
-
-        regionReflect.setChannel( dto.getChannel() );
-        regionReflect.setRegionSrc( dto.getRegionSrc() );
-        regionReflect.setRegionDes( dto.getRegionDes() );
-
-        return regionReflect;
-    }
-
-    @Override
-    public MerchantRateNewVO toVO(MerchantRateNew merchantRateNew) {
-        if ( merchantRateNew == null ) {
-            return null;
-        }
-
-        MerchantRateNewVO merchantRateNewVO = new MerchantRateNewVO();
-
-        merchantRateNewVO.setUserId( merchantRateNew.getUserId() );
-        merchantRateNewVO.setId( merchantRateNew.getId() );
-        merchantRateNewVO.setChannel( merchantRateNew.getChannel() );
-        merchantRateNewVO.setMerchantId( merchantRateNew.getMerchantId() );
-        merchantRateNewVO.setWxRate( merchantRateNew.getWxRate() );
-        merchantRateNewVO.setAliRate( merchantRateNew.getAliRate() );
-        merchantRateNewVO.setBankRate( merchantRateNew.getBankRate() );
-        merchantRateNewVO.setBankRateLarge( merchantRateNew.getBankRateLarge() );
-        merchantRateNewVO.setWxRateValue( merchantRateNew.getWxRateValue() );
-        merchantRateNewVO.setAliRateValue( merchantRateNew.getAliRateValue() );
-        merchantRateNewVO.setBankRateValue( merchantRateNew.getBankRateValue() );
-        merchantRateNewVO.setBankRateLargeValue( merchantRateNew.getBankRateLargeValue() );
-        merchantRateNewVO.setCreateTime( merchantRateNew.getCreateTime() );
-        merchantRateNewVO.setCreateTimeStart( merchantRateNew.getCreateTimeStart() );
-        merchantRateNewVO.setCreateTimeEnd( merchantRateNew.getCreateTimeEnd() );
-        merchantRateNewVO.setUpdateTime( merchantRateNew.getUpdateTime() );
-        merchantRateNewVO.setUpdateTimeStart( merchantRateNew.getUpdateTimeStart() );
-        merchantRateNewVO.setUpdateTimeEnd( merchantRateNew.getUpdateTimeEnd() );
-
-        return merchantRateNewVO;
-    }
-
-    @Override
-    public MerchantRateNew trans(MerchantRateNewRecord rateNewRecord) {
-        if ( rateNewRecord == null ) {
-            return null;
-        }
-
-        MerchantRateNew merchantRateNew = new MerchantRateNew();
-
-        merchantRateNew.setId( rateNewRecord.getId() );
-        merchantRateNew.setChannel( rateNewRecord.getChannel() );
-        merchantRateNew.setMerchantId( rateNewRecord.getMerchantId() );
-        merchantRateNew.setWxRate( rateNewRecord.getWxRate() );
-        merchantRateNew.setAliRate( rateNewRecord.getAliRate() );
-        merchantRateNew.setBankRate( rateNewRecord.getBankRate() );
-        merchantRateNew.setBankRateLarge( rateNewRecord.getBankRateLarge() );
-        merchantRateNew.setCreateTime( rateNewRecord.getCreateTime() );
-        merchantRateNew.setCreateTimeStart( rateNewRecord.getCreateTimeStart() );
-        merchantRateNew.setCreateTimeEnd( rateNewRecord.getCreateTimeEnd() );
-        merchantRateNew.setUpdateTime( rateNewRecord.getUpdateTime() );
-        merchantRateNew.setUpdateTimeStart( rateNewRecord.getUpdateTimeStart() );
-        merchantRateNew.setUpdateTimeEnd( rateNewRecord.getUpdateTimeEnd() );
-
-        return merchantRateNew;
-    }
-
-    @Override
-    public MerchantRateNewRecord trans(MerchantRateNew rateNew) {
-        if ( rateNew == null ) {
-            return null;
-        }
-
-        MerchantRateNewRecord merchantRateNewRecord = new MerchantRateNewRecord();
-
-        merchantRateNewRecord.setId( rateNew.getId() );
-        merchantRateNewRecord.setChannel( rateNew.getChannel() );
-        merchantRateNewRecord.setMerchantId( rateNew.getMerchantId() );
-        merchantRateNewRecord.setWxRate( rateNew.getWxRate() );
-        merchantRateNewRecord.setAliRate( rateNew.getAliRate() );
-        merchantRateNewRecord.setBankRate( rateNew.getBankRate() );
-        merchantRateNewRecord.setBankRateLarge( rateNew.getBankRateLarge() );
-        merchantRateNewRecord.setCreateTime( rateNew.getCreateTime() );
-        merchantRateNewRecord.setCreateTimeStart( rateNew.getCreateTimeStart() );
-        merchantRateNewRecord.setCreateTimeEnd( rateNew.getCreateTimeEnd() );
-        merchantRateNewRecord.setUpdateTime( rateNew.getUpdateTime() );
-        merchantRateNewRecord.setUpdateTimeStart( rateNew.getUpdateTimeStart() );
-        merchantRateNewRecord.setUpdateTimeEnd( rateNew.getUpdateTimeEnd() );
-
-        return merchantRateNewRecord;
-    }
-
-    @Override
-    public void cp(MerchantRateNewRecord source, MerchantRateNew target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getChannel() != null ) {
-            target.setChannel( source.getChannel() );
-        }
-        if ( source.getMerchantId() != null ) {
-            target.setMerchantId( source.getMerchantId() );
-        }
-        if ( source.getWxRate() != null ) {
-            target.setWxRate( source.getWxRate() );
-        }
-        if ( source.getAliRate() != null ) {
-            target.setAliRate( source.getAliRate() );
-        }
-        if ( source.getBankRate() != null ) {
-            target.setBankRate( source.getBankRate() );
-        }
-        if ( source.getBankRateLarge() != null ) {
-            target.setBankRateLarge( source.getBankRateLarge() );
-        }
-        if ( source.getCreateTimeStart() != null ) {
-            target.setCreateTimeStart( source.getCreateTimeStart() );
-        }
-        if ( source.getCreateTimeEnd() != null ) {
-            target.setCreateTimeEnd( source.getCreateTimeEnd() );
-        }
-        if ( source.getUpdateTimeStart() != null ) {
-            target.setUpdateTimeStart( source.getUpdateTimeStart() );
-        }
-        if ( source.getUpdateTimeEnd() != null ) {
-            target.setUpdateTimeEnd( source.getUpdateTimeEnd() );
-        }
-    }
-
-    @Override
-    public MerchantRateNewRecordVO toVO(MerchantRateNewRecord rateNewRecord) {
-        if ( rateNewRecord == null ) {
-            return null;
-        }
-
-        MerchantRateNewRecordVO merchantRateNewRecordVO = new MerchantRateNewRecordVO();
-
-        merchantRateNewRecordVO.setId( rateNewRecord.getId() );
-        merchantRateNewRecordVO.setChannel( rateNewRecord.getChannel() );
-        merchantRateNewRecordVO.setMerchantId( rateNewRecord.getMerchantId() );
-        merchantRateNewRecordVO.setWxRate( rateNewRecord.getWxRate() );
-        merchantRateNewRecordVO.setAliRate( rateNewRecord.getAliRate() );
-        merchantRateNewRecordVO.setBankRate( rateNewRecord.getBankRate() );
-        merchantRateNewRecordVO.setBankRateLarge( rateNewRecord.getBankRateLarge() );
-        merchantRateNewRecordVO.setRemark( rateNewRecord.getRemark() );
-        merchantRateNewRecordVO.setStatus( rateNewRecord.getStatus() );
-        merchantRateNewRecordVO.setCreateTime( rateNewRecord.getCreateTime() );
-        merchantRateNewRecordVO.setCreateTimeStart( rateNewRecord.getCreateTimeStart() );
-        merchantRateNewRecordVO.setCreateTimeEnd( rateNewRecord.getCreateTimeEnd() );
-        merchantRateNewRecordVO.setUpdateTime( rateNewRecord.getUpdateTime() );
-        merchantRateNewRecordVO.setUpdateTimeStart( rateNewRecord.getUpdateTimeStart() );
-        merchantRateNewRecordVO.setUpdateTimeEnd( rateNewRecord.getUpdateTimeEnd() );
-
-        return merchantRateNewRecordVO;
-    }
-
-    @Override
-    public AccountDTO toDTO(Account account) {
-        if ( account == null ) {
-            return null;
-        }
-
-        AccountDTO accountDTO = new AccountDTO();
-
-        accountDTO.setId( account.getId() );
-        accountDTO.setUserId( account.getUserId() );
-        accountDTO.setCertificateUrl( account.getCertificateUrl() );
-        accountDTO.setSettleType( account.getSettleType() );
-        accountDTO.setIdCardId( account.getIdCardId() );
-        accountDTO.setBankCardId( account.getBankCardId() );
-        accountDTO.setChannelType( account.getChannelType() );
-        accountDTO.setCreateTime( account.getCreateTime() );
-        accountDTO.setCreateTimeStart( account.getCreateTimeStart() );
-        accountDTO.setCreateTimeEnd( account.getCreateTimeEnd() );
-        accountDTO.setUpdateTime( account.getUpdateTime() );
-        accountDTO.setUpdateTimeStart( account.getUpdateTimeStart() );
-        accountDTO.setUpdateTimeEnd( account.getUpdateTimeEnd() );
-        JSONObject jSONObject = account.getBak();
-        if ( jSONObject != null ) {
-            accountDTO.setBak( new JSONObject( jSONObject ) );
-        }
-
-        return accountDTO;
-    }
-
-    @Override
-    public Account toEntity(AccountDTO accountDTO) {
-        if ( accountDTO == null ) {
-            return null;
-        }
-
-        Account account = new Account();
-
-        account.setId( accountDTO.getId() );
-        account.setUserId( accountDTO.getUserId() );
-        account.setCertificateUrl( accountDTO.getCertificateUrl() );
-        account.setSettleType( accountDTO.getSettleType() );
-        account.setIdCardId( accountDTO.getIdCardId() );
-        account.setBankCardId( accountDTO.getBankCardId() );
-        account.setChannelType( accountDTO.getChannelType() );
-        account.setCreateTime( accountDTO.getCreateTime() );
-        account.setCreateTimeStart( accountDTO.getCreateTimeStart() );
-        account.setCreateTimeEnd( accountDTO.getCreateTimeEnd() );
-        account.setUpdateTime( accountDTO.getUpdateTime() );
-        account.setUpdateTimeStart( accountDTO.getUpdateTimeStart() );
-        account.setUpdateTimeEnd( accountDTO.getUpdateTimeEnd() );
-        JSONObject jSONObject = accountDTO.getBak();
-        if ( jSONObject != null ) {
-            account.setBak( new JSONObject( jSONObject ) );
-        }
-
-        return account;
-    }
-
-    @Override
-    public void cp(IdCard source, IdCard target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getUserId() != null ) {
-            target.setUserId( source.getUserId() );
-        }
-        if ( source.getCertType() != null ) {
-            target.setCertType( source.getCertType() );
-        }
-        if ( source.getUserType() != null ) {
-            target.setUserType( source.getUserType() );
-        }
-        if ( source.getCertNo() != null ) {
-            target.setCertNo( source.getCertNo() );
-        }
-        if ( source.getCertName() != null ) {
-            target.setCertName( source.getCertName() );
-        }
-        if ( source.getCertStartTime() != null ) {
-            target.setCertStartTime( source.getCertStartTime() );
-        }
-        if ( source.getCertEndTime() != null ) {
-            target.setCertEndTime( source.getCertEndTime() );
-        }
-        if ( source.getCertAddress() != null ) {
-            target.setCertAddress( source.getCertAddress() );
-        }
-        if ( source.getCreateTimeStart() != null ) {
-            target.setCreateTimeStart( source.getCreateTimeStart() );
-        }
-        if ( source.getCreateTimeEnd() != null ) {
-            target.setCreateTimeEnd( source.getCreateTimeEnd() );
-        }
-        if ( source.getUpdateTimeStart() != null ) {
-            target.setUpdateTimeStart( source.getUpdateTimeStart() );
-        }
-        if ( source.getUpdateTimeEnd() != null ) {
-            target.setUpdateTimeEnd( source.getUpdateTimeEnd() );
-        }
-        if ( source.getImgPositive() != null ) {
-            target.setImgPositive( source.getImgPositive() );
-        }
-        if ( source.getImgNegative() != null ) {
-            target.setImgNegative( source.getImgNegative() );
-        }
-    }
-
-    @Override
-    public void cp(BankCard source, BankCard target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getUserId() != null ) {
-            target.setUserId( source.getUserId() );
-        }
-        if ( source.getBankHolder() != null ) {
-            target.setBankHolder( source.getBankHolder() );
-        }
-        if ( source.getBankCardNo() != null ) {
-            target.setBankCardNo( source.getBankCardNo() );
-        }
-        if ( source.getBankName() != null ) {
-            target.setBankName( source.getBankName() );
-        }
-        if ( source.getBranchName() != null ) {
-            target.setBranchName( source.getBranchName() );
-        }
-        if ( source.getAccountType() != null ) {
-            target.setAccountType( source.getAccountType() );
-        }
-        if ( source.getContactLine() != null ) {
-            target.setContactLine( source.getContactLine() );
-        }
-        if ( source.getBranchProvince() != null ) {
-            target.setBranchProvince( source.getBranchProvince() );
-        }
-        if ( source.getBranchCity() != null ) {
-            target.setBranchCity( source.getBranchCity() );
-        }
-        if ( source.getBranchArea() != null ) {
-            target.setBranchArea( source.getBranchArea() );
-        }
-        if ( source.getBankAddressNo() != null ) {
-            target.setBankAddressNo( source.getBankAddressNo() );
-        }
-        if ( source.getPhone() != null ) {
-            target.setPhone( source.getPhone() );
-        }
-        if ( source.getCreateTimeStart() != null ) {
-            target.setCreateTimeStart( source.getCreateTimeStart() );
-        }
-        if ( source.getCreateTimeEnd() != null ) {
-            target.setCreateTimeEnd( source.getCreateTimeEnd() );
-        }
-        if ( source.getUpdateTimeStart() != null ) {
-            target.setUpdateTimeStart( source.getUpdateTimeStart() );
-        }
-        if ( source.getUpdateTimeEnd() != null ) {
-            target.setUpdateTimeEnd( source.getUpdateTimeEnd() );
-        }
-        if ( source.getImgUrl() != null ) {
-            target.setImgUrl( source.getImgUrl() );
-        }
-        if ( source.getLicenseUrl() != null ) {
-            target.setLicenseUrl( source.getLicenseUrl() );
-        }
-    }
-
-    @Override
-    public void cp(Account source, AccountDTO target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getId() != null ) {
-            target.setId( source.getId() );
-        }
-        if ( source.getUserId() != null ) {
-            target.setUserId( source.getUserId() );
-        }
-        if ( source.getCertificateUrl() != null ) {
-            target.setCertificateUrl( source.getCertificateUrl() );
-        }
-        if ( source.getSettleType() != null ) {
-            target.setSettleType( source.getSettleType() );
-        }
-        if ( source.getIdCardId() != null ) {
-            target.setIdCardId( source.getIdCardId() );
-        }
-        if ( source.getBankCardId() != null ) {
-            target.setBankCardId( source.getBankCardId() );
-        }
-        if ( source.getChannelType() != null ) {
-            target.setChannelType( source.getChannelType() );
-        }
-        if ( source.getCreateTime() != null ) {
-            target.setCreateTime( source.getCreateTime() );
-        }
-        if ( source.getCreateTimeStart() != null ) {
-            target.setCreateTimeStart( source.getCreateTimeStart() );
-        }
-        if ( source.getCreateTimeEnd() != null ) {
-            target.setCreateTimeEnd( source.getCreateTimeEnd() );
-        }
-        if ( source.getUpdateTime() != null ) {
-            target.setUpdateTime( source.getUpdateTime() );
-        }
-        if ( source.getUpdateTimeStart() != null ) {
-            target.setUpdateTimeStart( source.getUpdateTimeStart() );
-        }
-        if ( source.getUpdateTimeEnd() != null ) {
-            target.setUpdateTimeEnd( source.getUpdateTimeEnd() );
-        }
-        if ( target.getBak() != null ) {
-            JSONObject jSONObject = source.getBak();
-            if ( jSONObject != null ) {
-                target.getBak().clear();
-                target.getBak().putAll( jSONObject );
-            }
-        }
-        else {
-            JSONObject jSONObject = source.getBak();
-            if ( jSONObject != null ) {
-                target.setBak( new JSONObject( jSONObject ) );
-            }
-        }
-    }
-
-    @Override
-    public void cp(AccountDTO source, Account target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getId() != null ) {
-            target.setId( source.getId() );
-        }
-        if ( source.getUserId() != null ) {
-            target.setUserId( source.getUserId() );
-        }
-        if ( source.getCertificateUrl() != null ) {
-            target.setCertificateUrl( source.getCertificateUrl() );
-        }
-        if ( source.getSettleType() != null ) {
-            target.setSettleType( source.getSettleType() );
-        }
-        if ( source.getIdCardId() != null ) {
-            target.setIdCardId( source.getIdCardId() );
-        }
-        if ( source.getBankCardId() != null ) {
-            target.setBankCardId( source.getBankCardId() );
-        }
-        if ( source.getChannelType() != null ) {
-            target.setChannelType( source.getChannelType() );
-        }
-        if ( source.getCreateTime() != null ) {
-            target.setCreateTime( source.getCreateTime() );
-        }
-        if ( source.getCreateTimeStart() != null ) {
-            target.setCreateTimeStart( source.getCreateTimeStart() );
-        }
-        if ( source.getCreateTimeEnd() != null ) {
-            target.setCreateTimeEnd( source.getCreateTimeEnd() );
-        }
-        if ( source.getUpdateTime() != null ) {
-            target.setUpdateTime( source.getUpdateTime() );
-        }
-        if ( source.getUpdateTimeStart() != null ) {
-            target.setUpdateTimeStart( source.getUpdateTimeStart() );
-        }
-        if ( source.getUpdateTimeEnd() != null ) {
-            target.setUpdateTimeEnd( source.getUpdateTimeEnd() );
-        }
-        if ( target.getBak() != null ) {
-            JSONObject jSONObject = source.getBak();
-            if ( jSONObject != null ) {
-                target.getBak().clear();
-                target.getBak().putAll( jSONObject );
-            }
-        }
-        else {
-            JSONObject jSONObject = source.getBak();
-            if ( jSONObject != null ) {
-                target.setBak( new JSONObject( jSONObject ) );
-            }
-        }
-    }
-
-    @Override
-    public void cp(BankInfoDTO source, BankCard target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getUserId() != null ) {
-            target.setUserId( source.getUserId() );
-        }
-        if ( source.getBankCardNo() != null ) {
-            target.setBankCardNo( source.getBankCardNo() );
-        }
-        if ( source.getBankName() != null ) {
-            target.setBankName( source.getBankName() );
-        }
-        if ( source.getBranchName() != null ) {
-            target.setBranchName( source.getBranchName() );
-        }
-        if ( source.getAccountType() != null ) {
-            target.setAccountType( source.getAccountType() );
-        }
-        if ( source.getContactLine() != null ) {
-            target.setContactLine( source.getContactLine() );
-        }
-        if ( source.getBranchProvince() != null ) {
-            target.setBranchProvince( source.getBranchProvince() );
-        }
-        if ( source.getBranchCity() != null ) {
-            target.setBranchCity( source.getBranchCity() );
-        }
-        if ( source.getBranchArea() != null ) {
-            target.setBranchArea( source.getBranchArea() );
-        }
-        if ( source.getBankAddressNo() != null ) {
-            target.setBankAddressNo( source.getBankAddressNo() );
-        }
-        if ( source.getPhone() != null ) {
-            target.setPhone( source.getPhone() );
-        }
-        if ( source.getImgUrl() != null ) {
-            target.setImgUrl( source.getImgUrl() );
-        }
-    }
-
-    @Override
-    public void cp(UserApp source, UserAppVO target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getId() != null ) {
-            target.setId( source.getId() );
-        }
-        if ( source.getLoginName() != null ) {
-            target.setLoginName( source.getLoginName() );
-        }
-        if ( source.getUserId() != null ) {
-            target.setUserId( source.getUserId() );
-        }
-        if ( source.getUserName() != null ) {
-            target.setUserName( source.getUserName() );
-        }
-        if ( source.getUserType() != null ) {
-            target.setUserType( source.getUserType() );
-        }
-        if ( source.getStaffType() != null ) {
-            target.setStaffType( source.getStaffType() );
-        }
-        if ( source.getLogo() != null ) {
-            target.setLogo( source.getLogo() );
-        }
-        if ( source.getLevel() != null ) {
-            target.setLevel( source.getLevel() );
-        }
-        if ( source.getCreateDt() != null ) {
-            target.setCreateDt( source.getCreateDt() );
-        }
-        if ( source.getUpdateDt() != null ) {
-            target.setUpdateDt( source.getUpdateDt() );
-        }
-        if ( source.getExtendProfit() != null ) {
-            target.setExtendProfit( source.getExtendProfit() );
-        }
-        if ( source.getStatus() != null ) {
-            target.setStatus( source.getStatus() );
-        }
-        if ( source.getFansProfit() != null ) {
-            target.setFansProfit( source.getFansProfit() );
-        }
-        if ( source.getCashProfit() != null ) {
-            target.setCashProfit( source.getCashProfit() );
-        }
-        if ( source.getParentId() != null ) {
-            target.setParentId( source.getParentId() );
-        }
-        if ( source.getAgentStaffId() != null ) {
-            target.setAgentStaffId( source.getAgentStaffId() );
-        }
-        if ( source.getInviteNum() != null ) {
-            target.setInviteNum( source.getInviteNum() );
-        }
-        if ( source.getTradeMoney() != null ) {
-            target.setTradeMoney( source.getTradeMoney() );
-        }
-        if ( source.getCertnum() != null ) {
-            target.setCertnum( source.getCertnum() );
-        }
-        if ( source.getCertReason() != null ) {
-            target.setCertReason( source.getCertReason() );
-        }
-        if ( source.getBankBranch() != null ) {
-            target.setBankBranch( source.getBankBranch() );
-        }
-        if ( source.getBankName() != null ) {
-            target.setBankName( source.getBankName() );
-        }
-        if ( source.getBankNo() != null ) {
-            target.setBankNo( source.getBankNo() );
-        }
-        if ( source.getPhone() != null ) {
-            target.setPhone( source.getPhone() );
-        }
-        if ( source.getBankStatus() != null ) {
-            target.setBankStatus( source.getBankStatus() );
-        }
-        if ( source.getBankReason() != null ) {
-            target.setBankReason( source.getBankReason() );
-        }
-        if ( source.getMerchantCode() != null ) {
-            target.setMerchantCode( source.getMerchantCode() );
-        }
-        if ( source.getSort() != null ) {
-            target.setSort( source.getSort() );
-        }
-        if ( source.getMerchantName() != null ) {
-            target.setMerchantName( source.getMerchantName() );
-        }
-        if ( source.getStoreName() != null ) {
-            target.setStoreName( source.getStoreName() );
-        }
-        if ( source.getStoreId() != null ) {
-            target.setStoreId( source.getStoreId() );
-        }
-        if ( source.getContactName() != null ) {
-            target.setContactName( source.getContactName() );
-        }
-        if ( source.getProductDesc() != null ) {
-            target.setProductDesc( source.getProductDesc() );
-        }
-        if ( source.getBussAuthNum() != null ) {
-            target.setBussAuthNum( source.getBussAuthNum() );
-        }
-        if ( source.getAisleSwitch() != null ) {
-            target.setAisleSwitch( source.getAisleSwitch() );
-        }
-        if ( source.getToken() != null ) {
-            target.setToken( source.getToken() );
-        }
-        if ( source.getIsVoice() != null ) {
-            target.setIsVoice( source.getIsVoice() );
-        }
-        if ( source.getPIdArr() != null ) {
-            target.setPIdArr( source.getPIdArr() );
-        }
-        if ( source.getAuditReason() != null ) {
-            target.setAuditReason( source.getAuditReason() );
-        }
-        if ( source.getIsFixedRate() != null ) {
-            target.setIsFixedRate( source.getIsFixedRate() );
-        }
-        if ( source.getAutoAudit() != null ) {
-            target.setAutoAudit( source.getAutoAudit() );
-        }
-        if ( source.getPayEcdemicSwitch() != null ) {
-            target.setPayEcdemicSwitch( source.getPayEcdemicSwitch() );
-        }
-        if ( source.getIsMarket() != null ) {
-            target.setIsMarket( source.getIsMarket() );
-        }
-        if ( source.getIsUnionPay() != null ) {
-            target.setIsUnionPay( source.getIsUnionPay() );
-        }
-        if ( source.getRoleCode() != null ) {
-            target.setRoleCode( source.getRoleCode() );
-        }
-        if ( source.getLevelCode() != null ) {
-            target.setLevelCode( source.getLevelCode() );
-        }
-        if ( source.getLicenseFullName() != null ) {
-            target.setLicenseFullName( source.getLicenseFullName() );
-        }
-        if ( target.getMerchantImagesList() != null ) {
-            List<MerchantImage> list = source.getMerchantImagesList();
-            if ( list != null ) {
-                target.getMerchantImagesList().clear();
-                target.getMerchantImagesList().addAll( list );
-            }
-        }
-        else {
-            List<MerchantImage> list = source.getMerchantImagesList();
-            if ( list != null ) {
-                target.setMerchantImagesList( new ArrayList<MerchantImage>( list ) );
-            }
-        }
-        if ( source.getRegistUrl() != null ) {
-            target.setRegistUrl( source.getRegistUrl() );
-        }
-        if ( source.getPassword() != null ) {
-            target.setPassword( source.getPassword() );
-        }
-        if ( source.getMerchantStatus() != null ) {
-            target.setMerchantStatus( source.getMerchantStatus() );
-        }
-        if ( source.getMerchantReason() != null ) {
-            target.setMerchantReason( source.getMerchantReason() );
-        }
-        if ( source.getMerchantType() != null ) {
-            target.setMerchantType( source.getMerchantType() );
-        }
-        if ( source.getBankCertName() != null ) {
-            target.setBankCertName( source.getBankCertName() );
-        }
-        if ( target.getParentIdList() != null ) {
-            List<String> list1 = source.getParentIdList();
-            if ( list1 != null ) {
-                target.getParentIdList().clear();
-                target.getParentIdList().addAll( list1 );
-            }
-        }
-        else {
-            List<String> list1 = source.getParentIdList();
-            if ( list1 != null ) {
-                target.setParentIdList( new ArrayList<String>( list1 ) );
-            }
-        }
-        if ( source.getAlias() != null ) {
-            target.setAlias( source.getAlias() );
-        }
-        if ( source.getTotalMoney() != null ) {
-            target.setTotalMoney( source.getTotalMoney() );
-        }
-        if ( source.getType() != null ) {
-            target.setType( source.getType() );
-        }
-        if ( source.getRate() != null ) {
-            target.setRate( source.getRate() );
-        }
-        if ( source.getSize() != null ) {
-            target.setSize( source.getSize() );
-        }
-        if ( source.getPage() != null ) {
-            target.setPage( source.getPage() );
-        }
-        if ( source.getMercId() != null ) {
-            target.setMercId( source.getMercId() );
-        }
-        if ( source.getMerchantId() != null ) {
-            target.setMerchantId( source.getMerchantId() );
-        }
-        if ( source.getMerchantAuditStatus() != null ) {
-            target.setMerchantAuditStatus( source.getMerchantAuditStatus() );
-        }
-        if ( source.getMerchantBaseInfo() != null ) {
-            target.setMerchantBaseInfo( source.getMerchantBaseInfo() );
-        }
-        if ( source.getMerchantBankCard() != null ) {
-            target.setMerchantBankCard( source.getMerchantBankCard() );
-        }
-        if ( source.getBankCard() != null ) {
-            if ( target.getBankCard() == null ) {
-                target.setBankCard( new BankCard() );
-            }
-            cp( source.getBankCard(), target.getBankCard() );
-        }
-        if ( source.getIdCard() != null ) {
-            if ( target.getIdCard() == null ) {
-                target.setIdCard( new IdCard() );
-            }
-            cp( source.getIdCard(), target.getIdCard() );
-        }
-        if ( source.getStartDate() != null ) {
-            target.setStartDate( source.getStartDate() );
-        }
-        if ( source.getEndDate() != null ) {
-            target.setEndDate( source.getEndDate() );
-        }
-        if ( source.getThirdStatus() != null ) {
-            target.setThirdStatus( source.getThirdStatus() );
-        }
-        if ( source.getStoreId2() != null ) {
-            target.setStoreId2( source.getStoreId2() );
-        }
-        if ( source.getMcsStatus() != null ) {
-            target.setMcsStatus( source.getMcsStatus() );
-        }
-        if ( source.getRemark() != null ) {
-            target.setRemark( source.getRemark() );
-        }
-        if ( source.getUpdateTime() != null ) {
-            target.setUpdateTime( source.getUpdateTime() );
-        }
-        if ( source.getPpStatus() != null ) {
-            target.setPpStatus( source.getPpStatus() );
-        }
-        if ( source.getPpThirdStatus() != null ) {
-            target.setPpThirdStatus( source.getPpThirdStatus() );
-        }
-        if ( source.getPluginRemark() != null ) {
-            target.setPluginRemark( source.getPluginRemark() );
-        }
-        if ( target.getChannelStatusList() != null ) {
-            List<MerchantChannelStatus> list2 = source.getChannelStatusList();
-            if ( list2 != null ) {
-                target.getChannelStatusList().clear();
-                target.getChannelStatusList().addAll( list2 );
-            }
-        }
-        else {
-            List<MerchantChannelStatus> list2 = source.getChannelStatusList();
-            if ( list2 != null ) {
-                target.setChannelStatusList( new ArrayList<MerchantChannelStatus>( list2 ) );
-            }
-        }
-        if ( source.getPayPassword() != null ) {
-            target.setPayPassword( source.getPayPassword() );
-        }
-        if ( source.getPermissionBill() != null ) {
-            target.setPermissionBill( source.getPermissionBill() );
-        }
-        if ( source.getFaceCert() != null ) {
-            target.setFaceCert( source.getFaceCert() );
-        }
-        if ( source.getFaceCompare() != null ) {
-            target.setFaceCompare( source.getFaceCompare() );
-        }
-        if ( source.getSpreadFlag() != null ) {
-            target.setSpreadFlag( source.getSpreadFlag() );
-        }
-        if ( source.getUserNo() != null ) {
-            target.setUserNo( source.getUserNo() );
-        }
-        if ( source.getTypeMark() != null ) {
-            target.setTypeMark( source.getTypeMark() );
-        }
-        if ( source.getAreaMark() != null ) {
-            target.setAreaMark( source.getAreaMark() );
-        }
-        if ( source.getJfShopKey() != null ) {
-            target.setJfShopKey( source.getJfShopKey() );
-        }
-    }
-
-    @Override
-    public AccountVO toVO(AccountDTO accountDTO) {
-        if ( accountDTO == null ) {
-            return null;
-        }
-
-        AccountVO accountVO = new AccountVO();
-
-        accountVO.setId( accountDTO.getId() );
-        accountVO.setUserId( accountDTO.getUserId() );
-        accountVO.setCertificateUrl( accountDTO.getCertificateUrl() );
-        accountVO.setSettleType( accountDTO.getSettleType() );
-        accountVO.setIdCardId( accountDTO.getIdCardId() );
-        accountVO.setBankCardId( accountDTO.getBankCardId() );
-        accountVO.setChannelType( accountDTO.getChannelType() );
-        accountVO.setCreateTime( accountDTO.getCreateTime() );
-        accountVO.setCreateTimeStart( accountDTO.getCreateTimeStart() );
-        accountVO.setCreateTimeEnd( accountDTO.getCreateTimeEnd() );
-        accountVO.setUpdateTime( accountDTO.getUpdateTime() );
-        accountVO.setUpdateTimeStart( accountDTO.getUpdateTimeStart() );
-        accountVO.setUpdateTimeEnd( accountDTO.getUpdateTimeEnd() );
-        JSONObject jSONObject = accountDTO.getBak();
-        if ( jSONObject != null ) {
-            accountVO.setBak( new JSONObject( jSONObject ) );
-        }
-        accountVO.setStatus( accountDTO.getStatus() );
-        accountVO.setBankCard( accountDTO.getBankCard() );
-        accountVO.setIdcard( accountDTO.getIdcard() );
-        accountVO.setMerchantType( accountDTO.getMerchantType() );
-
-        return accountVO;
-    }
-
-    @Override
-    public DeviceStock toEntity(DeviceStockDTO deviceStockDTO) {
-        if ( deviceStockDTO == null ) {
-            return null;
-        }
-
-        DeviceStock deviceStock = new DeviceStock();
-
-        deviceStock.setId( deviceStockDTO.getId() );
-        deviceStock.setSnNo( deviceStockDTO.getSnNo() );
-        deviceStock.setDeviceNo( deviceStockDTO.getDeviceNo() );
-        deviceStock.setCode( deviceStockDTO.getCode() );
-        deviceStock.setOrderNo( deviceStockDTO.getOrderNo() );
-        deviceStock.setPrice( deviceStockDTO.getPrice() );
-        deviceStock.setType( deviceStockDTO.getType() );
-        deviceStock.setGroupNo( deviceStockDTO.getGroupNo() );
-        deviceStock.setBuyMercName( deviceStockDTO.getBuyMercName() );
-        deviceStock.setBuyMercId( deviceStockDTO.getBuyMercId() );
-        deviceStock.setActMercName( deviceStockDTO.getActMercName() );
-        deviceStock.setActMercId( deviceStockDTO.getActMercId() );
-        deviceStock.setActUserId( deviceStockDTO.getActUserId() );
-        deviceStock.setBuyUserId( deviceStockDTO.getBuyUserId() );
-        deviceStock.setStatus( deviceStockDTO.getStatus() );
-        deviceStock.setCreateTime( deviceStockDTO.getCreateTime() );
-        deviceStock.setUpdateTime( deviceStockDTO.getUpdateTime() );
-        deviceStock.setCreateTimeStart( deviceStockDTO.getCreateTimeStart() );
-        deviceStock.setCreateTimeEnd( deviceStockDTO.getCreateTimeEnd() );
-        deviceStock.setCreateBy( deviceStockDTO.getCreateBy() );
-        deviceStock.setDelFlag( deviceStockDTO.getDelFlag() );
-        deviceStock.setRemarks( deviceStockDTO.getRemarks() );
-        deviceStock.setStartSnNo( deviceStockDTO.getStartSnNo() );
-        deviceStock.setEndSnNo( deviceStockDTO.getEndSnNo() );
-        deviceStock.setBelongUserId( deviceStockDTO.getBelongUserId() );
-        deviceStock.setExtractUserId( deviceStockDTO.getExtractUserId() );
-        deviceStock.setRoleCode( deviceStockDTO.getRoleCode() );
-        deviceStock.setInStockTime( deviceStockDTO.getInStockTime() );
-        deviceStock.setTransferStatus( deviceStockDTO.getTransferStatus() );
-        deviceStock.setBindTime( deviceStockDTO.getBindTime() );
-
-        return deviceStock;
-    }
-
-    @Override
-    public BankCard toEntity(BankCardDTO bankCardDTO) {
-        if ( bankCardDTO == null ) {
-            return null;
-        }
-
-        BankCard bankCard = new BankCard();
-
-        bankCard.setId( bankCardDTO.getId() );
-        bankCard.setUserId( bankCardDTO.getUserId() );
-        bankCard.setBankHolder( bankCardDTO.getBankHolder() );
-        bankCard.setBankCardNo( bankCardDTO.getBankCardNo() );
-        bankCard.setBankName( bankCardDTO.getBankName() );
-        bankCard.setBranchName( bankCardDTO.getBranchName() );
-        bankCard.setAccountType( bankCardDTO.getAccountType() );
-        bankCard.setContactLine( bankCardDTO.getContactLine() );
-        bankCard.setBranchProvince( bankCardDTO.getBranchProvince() );
-        bankCard.setBranchCity( bankCardDTO.getBranchCity() );
-        bankCard.setBranchArea( bankCardDTO.getBranchArea() );
-        bankCard.setBankAddressNo( bankCardDTO.getBankAddressNo() );
-        bankCard.setPhone( bankCardDTO.getPhone() );
-        bankCard.setCreateTime( bankCardDTO.getCreateTime() );
-        bankCard.setCreateTimeStart( bankCardDTO.getCreateTimeStart() );
-        bankCard.setCreateTimeEnd( bankCardDTO.getCreateTimeEnd() );
-        bankCard.setUpdateTime( bankCardDTO.getUpdateTime() );
-        bankCard.setUpdateTimeStart( bankCardDTO.getUpdateTimeStart() );
-        bankCard.setUpdateTimeEnd( bankCardDTO.getUpdateTimeEnd() );
-        bankCard.setImgUrl( bankCardDTO.getImgUrl() );
-        bankCard.setLicenseUrl( bankCardDTO.getLicenseUrl() );
-
-        return bankCard;
-    }
-
-    @Override
-    public void cp(IpLocationCache source, DescribeIpv4LocationResponse target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getIp() != null ) {
-            target.setIp( source.getIp() );
-        }
-        if ( source.getCountry() != null ) {
-            target.setCountry( source.getCountry() );
-        }
-        if ( source.getProvince() != null ) {
-            target.setProvince( source.getProvince() );
-        }
-        if ( source.getCity() != null ) {
-            target.setCity( source.getCity() );
-        }
-        if ( source.getCounty() != null ) {
-            target.setCounty( source.getCounty() );
-        }
-        if ( source.getIsp() != null ) {
-            target.setIsp( source.getIsp() );
-        }
-    }
-
-    @Override
-    public void cp(DescribeIpv4LocationResponse source, IpLocationCache target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getIp() != null ) {
-            target.setIp( source.getIp() );
-        }
-        if ( source.getIsp() != null ) {
-            target.setIsp( source.getIsp() );
-        }
-        if ( source.getCountry() != null ) {
-            target.setCountry( source.getCountry() );
-        }
-        if ( source.getProvince() != null ) {
-            target.setProvince( source.getProvince() );
-        }
-        if ( source.getCity() != null ) {
-            target.setCity( source.getCity() );
-        }
-        if ( source.getCounty() != null ) {
-            target.setCounty( source.getCounty() );
-        }
-    }
-
-    @Override
-    public DeviceStockVO toVO(DeviceStock entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        DeviceStockVO deviceStockVO = new DeviceStockVO();
-
-        deviceStockVO.setId( entity.getId() );
-        deviceStockVO.setSnNo( entity.getSnNo() );
-        deviceStockVO.setDeviceNo( entity.getDeviceNo() );
-        deviceStockVO.setCode( entity.getCode() );
-        deviceStockVO.setOrderNo( entity.getOrderNo() );
-        deviceStockVO.setPrice( entity.getPrice() );
-        deviceStockVO.setType( entity.getType() );
-        deviceStockVO.setGroupNo( entity.getGroupNo() );
-        deviceStockVO.setBuyMercName( entity.getBuyMercName() );
-        deviceStockVO.setBuyMercId( entity.getBuyMercId() );
-        deviceStockVO.setActMercName( entity.getActMercName() );
-        deviceStockVO.setActMercId( entity.getActMercId() );
-        deviceStockVO.setActUserId( entity.getActUserId() );
-        deviceStockVO.setBuyUserId( entity.getBuyUserId() );
-        deviceStockVO.setStatus( entity.getStatus() );
-        deviceStockVO.setCreateTime( entity.getCreateTime() );
-        deviceStockVO.setUpdateTime( entity.getUpdateTime() );
-        deviceStockVO.setCreateTimeStart( entity.getCreateTimeStart() );
-        deviceStockVO.setCreateTimeEnd( entity.getCreateTimeEnd() );
-        deviceStockVO.setCreateBy( entity.getCreateBy() );
-        deviceStockVO.setDelFlag( entity.getDelFlag() );
-        deviceStockVO.setRemarks( entity.getRemarks() );
-        deviceStockVO.setStartSnNo( entity.getStartSnNo() );
-        deviceStockVO.setEndSnNo( entity.getEndSnNo() );
-        deviceStockVO.setBelongUserId( entity.getBelongUserId() );
-        deviceStockVO.setExtractUserId( entity.getExtractUserId() );
-        deviceStockVO.setRoleCode( entity.getRoleCode() );
-        deviceStockVO.setInStockTime( entity.getInStockTime() );
-        deviceStockVO.setTransferStatus( entity.getTransferStatus() );
-        deviceStockVO.setBindTime( entity.getBindTime() );
-
-        return deviceStockVO;
-    }
-
-    @Override
-    public DeviceDetailVO toVO(DeviceDetail entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        DeviceDetailVO deviceDetailVO = new DeviceDetailVO();
-
-        deviceDetailVO.setId( entity.getId() );
-        deviceDetailVO.setCode( entity.getCode() );
-        deviceDetailVO.setCodeDesc( entity.getCodeDesc() );
-        deviceDetailVO.setVenderCode( entity.getVenderCode() );
-        deviceDetailVO.setDeviceLogo( entity.getDeviceLogo() );
-        deviceDetailVO.setVenderName( entity.getVenderName() );
-        deviceDetailVO.setVenderModel( entity.getVenderModel() );
-        deviceDetailVO.setAisleModel( entity.getAisleModel() );
-        deviceDetailVO.setGroupNo( entity.getGroupNo() );
-        deviceDetailVO.setGroupNoDesc( entity.getGroupNoDesc() );
-        deviceDetailVO.setIntroDesc( entity.getIntroDesc() );
-        deviceDetailVO.setSeq( entity.getSeq() );
-        deviceDetailVO.setStatus( entity.getStatus() );
-        deviceDetailVO.setCreateDt( entity.getCreateDt() );
-        deviceDetailVO.setCreateDtStart( entity.getCreateDtStart() );
-        deviceDetailVO.setCreateDtEnd( entity.getCreateDtEnd() );
-        deviceDetailVO.setSize( entity.getSize() );
-        deviceDetailVO.setWholesalePrice( entity.getWholesalePrice() );
-        deviceDetailVO.setWholesaleMinNum( entity.getWholesaleMinNum() );
-        deviceDetailVO.setDetail( entity.getDetail() );
-        deviceDetailVO.setWeight( entity.getWeight() );
-        deviceDetailVO.setUnitPrice( entity.getUnitPrice() );
-        deviceDetailVO.setTypeDesc( entity.getTypeDesc() );
-        deviceDetailVO.setType( entity.getType() );
-
-        return deviceDetailVO;
-    }
-
-    @Override
-    public void cp(UserVoice source, UserVoice target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getUserId() != null ) {
-            target.setUserId( source.getUserId() );
-        }
-        if ( source.getPaySuccess() != null ) {
-            target.setPaySuccess( source.getPaySuccess() );
-        }
-        if ( source.getPayCancel() != null ) {
-            target.setPayCancel( source.getPayCancel() );
-        }
-        if ( source.getMemberCharge() != null ) {
-            target.setMemberCharge( source.getMemberCharge() );
-        }
-        if ( source.getMemberConsume() != null ) {
-            target.setMemberConsume( source.getMemberConsume() );
-        }
-        if ( source.getDeliveryOrder() != null ) {
-            target.setDeliveryOrder( source.getDeliveryOrder() );
-        }
-        if ( source.getStoreOrder() != null ) {
-            target.setStoreOrder( source.getStoreOrder() );
-        }
-        if ( source.getUrge() != null ) {
-            target.setUrge( source.getUrge() );
-        }
-    }
-
-    @Override
-    public void cp(MercTradeDataDTO source, MercTradeDataDTO target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getMerchantCode() != null ) {
-            target.setMerchantCode( source.getMerchantCode() );
-        }
-        if ( source.getPhone() != null ) {
-            target.setPhone( source.getPhone() );
-        }
-        if ( source.getUserId() != null ) {
-            target.setUserId( source.getUserId() );
-        }
-        if ( source.getAlias() != null ) {
-            target.setAlias( source.getAlias() );
-        }
-        if ( source.getTradeSumAmt() != null ) {
-            target.setTradeSumAmt( source.getTradeSumAmt() );
-        }
-        if ( source.getTradeSumNum() != null ) {
-            target.setTradeSumNum( source.getTradeSumNum() );
-        }
-        if ( source.getPrevTradeSumAmt() != null ) {
-            target.setPrevTradeSumAmt( source.getPrevTradeSumAmt() );
-        }
-        if ( source.getPrevTradeSumNum() != null ) {
-            target.setPrevTradeSumNum( source.getPrevTradeSumNum() );
-        }
-        if ( source.getAmtChain() != null ) {
-            target.setAmtChain( source.getAmtChain() );
-        }
-        if ( source.getNumChain() != null ) {
-            target.setNumChain( source.getNumChain() );
-        }
-        if ( source.getCondition() != null ) {
-            target.setCondition( source.getCondition() );
-        }
-        if ( source.getStartTime() != null ) {
-            target.setStartTime( source.getStartTime() );
-        }
-        if ( source.getEndTime() != null ) {
-            target.setEndTime( source.getEndTime() );
-        }
-        if ( source.getField() != null ) {
-            target.setField( source.getField() );
-        }
-        if ( source.getOrder() != null ) {
-            target.setOrder( source.getOrder() );
-        }
-        if ( source.getPayEcdemicSwitch() != null ) {
-            target.setPayEcdemicSwitch( source.getPayEcdemicSwitch() );
-        }
-        if ( source.getFollowStatus() != null ) {
-            target.setFollowStatus( source.getFollowStatus() );
-        }
-        if ( source.getStoreId() != null ) {
-            target.setStoreId( source.getStoreId() );
-        }
-    }
-
-    @Override
-    public JftReceiptInfoVO toVO(JftReceiptInfo entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        JftReceiptInfoVO jftReceiptInfoVO = new JftReceiptInfoVO();
-
-        jftReceiptInfoVO.setId( entity.getId() );
-        jftReceiptInfoVO.setProjectName( entity.getProjectName() );
-        jftReceiptInfoVO.setAmount( entity.getAmount() );
-        jftReceiptInfoVO.setUserId( entity.getUserId() );
-        jftReceiptInfoVO.setStatus( entity.getStatus() );
-        jftReceiptInfoVO.setCreateTime( entity.getCreateTime() );
-        jftReceiptInfoVO.setCreateTimeStart( entity.getCreateTimeStart() );
-        jftReceiptInfoVO.setCreateTimeEnd( entity.getCreateTimeEnd() );
-        jftReceiptInfoVO.setEndTime( entity.getEndTime() );
-        jftReceiptInfoVO.setEndTimeStart( entity.getEndTimeStart() );
-        jftReceiptInfoVO.setEndTimeEnd( entity.getEndTimeEnd() );
-        jftReceiptInfoVO.setToken( entity.getToken() );
-        List<Long> list = entity.getPaymentIds();
-        if ( list != null ) {
-            jftReceiptInfoVO.setPaymentIds( new ArrayList<Long>( list ) );
-        }
-        jftReceiptInfoVO.setStartDate( entity.getStartDate() );
-        jftReceiptInfoVO.setEndDate( entity.getEndDate() );
-        jftReceiptInfoVO.setQrCodeUrl( entity.getQrCodeUrl() );
-        jftReceiptInfoVO.setImageUrl( entity.getImageUrl() );
-        jftReceiptInfoVO.setIp( entity.getIp() );
-        jftReceiptInfoVO.setJumpUrl( entity.getJumpUrl() );
-        jftReceiptInfoVO.setJftRate( entity.getJftRate() );
-        jftReceiptInfoVO.setJftMerc( toVO( entity.getJftMerc() ) );
-        jftReceiptInfoVO.setJftChannel( toVO( entity.getJftChannel() ) );
-
-        return jftReceiptInfoVO;
-    }
-
-    @Override
-    public JftBankCard toJftData(BankCard bankCard) {
-        if ( bankCard == null ) {
-            return null;
-        }
-
-        JftBankCard jftBankCard = new JftBankCard();
-
-        if ( bankCard.getUserId() != null ) {
-            jftBankCard.setUserId( Long.parseLong( bankCard.getUserId() ) );
-        }
-        jftBankCard.setBankHolder( bankCard.getBankHolder() );
-        jftBankCard.setBankCardNo( bankCard.getBankCardNo() );
-        jftBankCard.setBankName( bankCard.getBankName() );
-        jftBankCard.setBranchName( bankCard.getBranchName() );
-        jftBankCard.setContactLine( bankCard.getContactLine() );
-        jftBankCard.setBranchProvince( bankCard.getBranchProvince() );
-        jftBankCard.setBranchCity( bankCard.getBranchCity() );
-        jftBankCard.setBranchArea( bankCard.getBranchArea() );
-        jftBankCard.setPhone( bankCard.getPhone() );
-        jftBankCard.setImgUrl( bankCard.getImgUrl() );
-        jftBankCard.setCreateTime( bankCard.getCreateTime() );
-        jftBankCard.setUpdateTime( bankCard.getUpdateTime() );
-
-        return jftBankCard;
-    }
-
-    @Override
-    public JftMerchantRateRecord toRecord(JftMerchantRate entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        JftMerchantRateRecord jftMerchantRateRecord = new JftMerchantRateRecord();
-
-        jftMerchantRateRecord.setChannel( entity.getChannel() );
-        jftMerchantRateRecord.setMerchantId( entity.getMerchantId() );
-        if ( entity.getAliRate() != null ) {
-            jftMerchantRateRecord.setAliRate( entity.getAliRate().intValue() );
-        }
-        jftMerchantRateRecord.setCreateTime( entity.getCreateTime() );
-        jftMerchantRateRecord.setCreateTimeStart( entity.getCreateTimeStart() );
-        jftMerchantRateRecord.setCreateTimeEnd( entity.getCreateTimeEnd() );
-        jftMerchantRateRecord.setUpdateTime( entity.getUpdateTime() );
-        jftMerchantRateRecord.setUpdateTimeStart( entity.getUpdateTimeStart() );
-        jftMerchantRateRecord.setUpdateTimeEnd( entity.getUpdateTimeEnd() );
-
-        return jftMerchantRateRecord;
-    }
-
-    @Override
-    public void cp(JftMerchantRateRecord source, JftMerchantRate target) {
-        if ( source == null ) {
-            return;
-        }
-
-        if ( source.getChannel() != null ) {
-            target.setChannel( source.getChannel() );
-        }
-        if ( source.getMerchantId() != null ) {
-            target.setMerchantId( source.getMerchantId() );
-        }
-        if ( source.getAliRate() != null ) {
-            target.setAliRate( BigDecimal.valueOf( source.getAliRate() ) );
-        }
-        if ( source.getCreateTimeStart() != null ) {
-            target.setCreateTimeStart( source.getCreateTimeStart() );
-        }
-        if ( source.getCreateTimeEnd() != null ) {
-            target.setCreateTimeEnd( source.getCreateTimeEnd() );
-        }
-        if ( source.getUpdateTimeStart() != null ) {
-            target.setUpdateTimeStart( source.getUpdateTimeStart() );
-        }
-        if ( source.getUpdateTimeEnd() != null ) {
-            target.setUpdateTimeEnd( source.getUpdateTimeEnd() );
-        }
-    }
-
-    @Override
-    public MercMemberSetVO toVO(MercMemberSet mercMemberSet) {
-        if ( mercMemberSet == null ) {
-            return null;
-        }
-
-        MercMemberSetVO mercMemberSetVO = new MercMemberSetVO();
-
-        mercMemberSetVO.setUserId( mercMemberSet.getUserId() );
-        mercMemberSetVO.setStatus( mercMemberSet.getStatus() );
-        mercMemberSetVO.setScope( mercMemberSet.getScope() );
-        mercMemberSetVO.setCreateTime( mercMemberSet.getCreateTime() );
-        mercMemberSetVO.setUpdateTime( mercMemberSet.getUpdateTime() );
-
-        return mercMemberSetVO;
-    }
-
-    @Override
-    public JftMercBaseInfoVO toVO(JftMercBaseInfo jftMercBaseInfo) {
-        if ( jftMercBaseInfo == null ) {
-            return null;
-        }
-
-        JftMercBaseInfoVO jftMercBaseInfoVO = new JftMercBaseInfoVO();
-
-        jftMercBaseInfoVO.setAutoFlag( jftMercBaseInfo.getAutoFlag() );
-        jftMercBaseInfoVO.setUserId( jftMercBaseInfo.getUserId() );
-        jftMercBaseInfoVO.setMerchantCode( jftMercBaseInfo.getMerchantCode() );
-        jftMercBaseInfoVO.setMerchantName( jftMercBaseInfo.getMerchantName() );
-        jftMercBaseInfoVO.setMerchantType( jftMercBaseInfo.getMerchantType() );
-        jftMercBaseInfoVO.setMcc( jftMercBaseInfo.getMcc() );
-        jftMercBaseInfoVO.setMccName( jftMercBaseInfo.getMccName() );
-        jftMercBaseInfoVO.setAlias( jftMercBaseInfo.getAlias() );
-        jftMercBaseInfoVO.setAddressNo( jftMercBaseInfo.getAddressNo() );
-        jftMercBaseInfoVO.setProvince( jftMercBaseInfo.getProvince() );
-        jftMercBaseInfoVO.setCity( jftMercBaseInfo.getCity() );
-        jftMercBaseInfoVO.setDistrict( jftMercBaseInfo.getDistrict() );
-        jftMercBaseInfoVO.setAddress( jftMercBaseInfo.getAddress() );
-        jftMercBaseInfoVO.setPrincipalPerson( jftMercBaseInfo.getPrincipalPerson() );
-        jftMercBaseInfoVO.setBussAuthName( jftMercBaseInfo.getBussAuthName() );
-        jftMercBaseInfoVO.setBussAuthNum( jftMercBaseInfo.getBussAuthNum() );
-        jftMercBaseInfoVO.setBussAuthAddress( jftMercBaseInfo.getBussAuthAddress() );
-        jftMercBaseInfoVO.setBussAuthStartTime( jftMercBaseInfo.getBussAuthStartTime() );
-        jftMercBaseInfoVO.setBussAuthEndTime( jftMercBaseInfo.getBussAuthEndTime() );
-        jftMercBaseInfoVO.setCreateTime( jftMercBaseInfo.getCreateTime() );
-        jftMercBaseInfoVO.setCreateTimeStart( jftMercBaseInfo.getCreateTimeStart() );
-        jftMercBaseInfoVO.setCreateTimeEnd( jftMercBaseInfo.getCreateTimeEnd() );
-        jftMercBaseInfoVO.setUpdateTime( jftMercBaseInfo.getUpdateTime() );
-        jftMercBaseInfoVO.setUpdateTimeStart( jftMercBaseInfo.getUpdateTimeStart() );
-        jftMercBaseInfoVO.setUpdateTimeEnd( jftMercBaseInfo.getUpdateTimeEnd() );
-        jftMercBaseInfoVO.setBuslicType( jftMercBaseInfo.getBuslicType() );
-        jftMercBaseInfoVO.setFrontPic( jftMercBaseInfo.getFrontPic() );
-        jftMercBaseInfoVO.setCashDesk( jftMercBaseInfo.getCashDesk() );
-        jftMercBaseInfoVO.setInterior( jftMercBaseInfo.getInterior() );
-        jftMercBaseInfoVO.setNotifyUrl( jftMercBaseInfo.getNotifyUrl() );
-
-        return jftMercBaseInfoVO;
-    }
-
-    @Override
-    public JftMercPaymentChannelVO toVO(JftMercPaymentChannel jftMercPaymentChannel) {
-        if ( jftMercPaymentChannel == null ) {
-            return null;
-        }
-
-        JftMercPaymentChannelVO jftMercPaymentChannelVO = new JftMercPaymentChannelVO();
-
-        jftMercPaymentChannelVO.setUserId( jftMercPaymentChannel.getUserId() );
-        jftMercPaymentChannelVO.setMerchantCode( jftMercPaymentChannel.getMerchantCode() );
-        jftMercPaymentChannelVO.setMerchantId( jftMercPaymentChannel.getMerchantId() );
-        jftMercPaymentChannelVO.setStatus( jftMercPaymentChannel.getStatus() );
-        jftMercPaymentChannelVO.setStatusDesc( jftMercPaymentChannel.getStatusDesc() );
-        jftMercPaymentChannelVO.setThirdStatus( jftMercPaymentChannel.getThirdStatus() );
-        jftMercPaymentChannelVO.setRemark( jftMercPaymentChannel.getRemark() );
-        jftMercPaymentChannelVO.setCreateTime( jftMercPaymentChannel.getCreateTime() );
-        jftMercPaymentChannelVO.setCreateTimeStart( jftMercPaymentChannel.getCreateTimeStart() );
-        jftMercPaymentChannelVO.setCreateTimeEnd( jftMercPaymentChannel.getCreateTimeEnd() );
-        jftMercPaymentChannelVO.setPassTime( jftMercPaymentChannel.getPassTime() );
-        jftMercPaymentChannelVO.setPassTimeStart( jftMercPaymentChannel.getPassTimeStart() );
-        jftMercPaymentChannelVO.setPassTimeEnd( jftMercPaymentChannel.getPassTimeEnd() );
-        jftMercPaymentChannelVO.setUpdateTime( jftMercPaymentChannel.getUpdateTime() );
-        jftMercPaymentChannelVO.setUpdateTimeStart( jftMercPaymentChannel.getUpdateTimeStart() );
-        jftMercPaymentChannelVO.setUpdateTimeEnd( jftMercPaymentChannel.getUpdateTimeEnd() );
-        jftMercPaymentChannelVO.setApplicationId( jftMercPaymentChannel.getApplicationId() );
-        JSONObject jSONObject = jftMercPaymentChannel.getExtra();
-        if ( jSONObject != null ) {
-            jftMercPaymentChannelVO.setExtra( new JSONObject( jSONObject ) );
-        }
-        jftMercPaymentChannelVO.setMercName( jftMercPaymentChannel.getMercName() );
-
-        return jftMercPaymentChannelVO;
-    }
-}
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java
deleted file mode 100644
index 5237bbf..0000000
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.pluss.platform.converter;
-
-import cn.pluss.platform.entity.MerchantImage;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-01-30T11:00:03+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
-)
-public class ImgConverterImpl implements ImgConverter {
-
-    @Override
-    public MerchantImage imgCopy(MerchantImage merchantImage) {
-        if ( merchantImage == null ) {
-            return null;
-        }
-
-        MerchantImage merchantImage1 = new MerchantImage();
-
-        merchantImage1.setId( merchantImage.getId() );
-        merchantImage1.setMerchantCode( merchantImage.getMerchantCode() );
-        merchantImage1.setPhotoType( merchantImage.getPhotoType() );
-        merchantImage1.setPhotoUrl( merchantImage.getPhotoUrl() );
-        merchantImage1.setPicUrl( merchantImage.getPicUrl() );
-        merchantImage1.setPicUrl1( merchantImage.getPicUrl1() );
-        merchantImage1.setPicUrl2( merchantImage.getPicUrl2() );
-        merchantImage1.setPicUrl3( merchantImage.getPicUrl3() );
-        merchantImage1.setPicUrl6( merchantImage.getPicUrl6() );
-        merchantImage1.setPicUrl7( merchantImage.getPicUrl7() );
-        merchantImage1.setPicUrl8( merchantImage.getPicUrl8() );
-        merchantImage1.setPicUrl9( merchantImage.getPicUrl9() );
-        merchantImage1.setPicUrl999( merchantImage.getPicUrl999() );
-        merchantImage1.setPicUrl101( merchantImage.getPicUrl101() );
-        merchantImage1.setPicUrl102( merchantImage.getPicUrl102() );
-        merchantImage1.setPicUrl11( merchantImage.getPicUrl11() );
-        merchantImage1.setCreateDt( merchantImage.getCreateDt() );
-        merchantImage1.setUpdateDt( merchantImage.getUpdateDt() );
-        merchantImage1.setAisleSwitch( merchantImage.getAisleSwitch() );
-
-        return merchantImage1;
-    }
-}
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java
deleted file mode 100644
index 4b2f3cd..0000000
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java
+++ /dev/null
@@ -1,314 +0,0 @@
-package cn.pluss.platform.converter;
-
-import cn.pluss.platform.dto.MerchantBaseInfoDTO;
-import cn.pluss.platform.entity.MerchantBaseInfo;
-import cn.pluss.platform.entity.MerchantStore;
-import cn.pluss.platform.entity.UserApp;
-import cn.pluss.platform.vo.MerchantBaseInfoVO;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-01-30T11:00:03+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
-)
-public class MerchantBaseInfoConverterImpl implements MerchantBaseInfoConverter {
-
-    @Override
-    public MerchantBaseInfoDTO domain2dto(MerchantBaseInfo entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        MerchantBaseInfoDTO merchantBaseInfoDTO = new MerchantBaseInfoDTO();
-
-        merchantBaseInfoDTO.setId( entity.getId() );
-        merchantBaseInfoDTO.setUserId( entity.getUserId() );
-        merchantBaseInfoDTO.setMerchantName( entity.getMerchantName() );
-        merchantBaseInfoDTO.setMerchantType( entity.getMerchantType() );
-        merchantBaseInfoDTO.setAlias( entity.getAlias() );
-        merchantBaseInfoDTO.setMcc( entity.getMcc() );
-        merchantBaseInfoDTO.setMccName( entity.getMccName() );
-        merchantBaseInfoDTO.setAliAccount( entity.getAliAccount() );
-        merchantBaseInfoDTO.setProductDesc( entity.getProductDesc() );
-        merchantBaseInfoDTO.setAddressNo( entity.getAddressNo() );
-        merchantBaseInfoDTO.setMerchantAddress( entity.getMerchantAddress() );
-        merchantBaseInfoDTO.setAddress( entity.getAddress() );
-        merchantBaseInfoDTO.setContactMobile( entity.getContactMobile() );
-        merchantBaseInfoDTO.setContactName( entity.getContactName() );
-        merchantBaseInfoDTO.setEmail( entity.getEmail() );
-        merchantBaseInfoDTO.setStoreHeadPic( entity.getStoreHeadPic() );
-        merchantBaseInfoDTO.setStoreInsidePic( entity.getStoreInsidePic() );
-        merchantBaseInfoDTO.setCashPic( entity.getCashPic() );
-        merchantBaseInfoDTO.setUserPhone( entity.getUserPhone() );
-
-        return merchantBaseInfoDTO;
-    }
-
-    @Override
-    public MerchantBaseInfoVO domain2VO(MerchantBaseInfo entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        MerchantBaseInfoVO merchantBaseInfoVO = new MerchantBaseInfoVO();
-
-        merchantBaseInfoVO.setId( entity.getId() );
-        merchantBaseInfoVO.setBindingCode( entity.getBindingCode() );
-        merchantBaseInfoVO.setUserId( entity.getUserId() );
-        merchantBaseInfoVO.setAliAccount( entity.getAliAccount() );
-        merchantBaseInfoVO.setMerchantCode( entity.getMerchantCode() );
-        merchantBaseInfoVO.setMerchantName( entity.getMerchantName() );
-        merchantBaseInfoVO.setMerchantType( entity.getMerchantType() );
-        merchantBaseInfoVO.setProductDesc( entity.getProductDesc() );
-        merchantBaseInfoVO.setAliMcc( entity.getAliMcc() );
-        merchantBaseInfoVO.setMcc( entity.getMcc() );
-        merchantBaseInfoVO.setMccName( entity.getMccName() );
-        merchantBaseInfoVO.setAlias( entity.getAlias() );
-        merchantBaseInfoVO.setContactMobile( entity.getContactMobile() );
-        merchantBaseInfoVO.setContactName( entity.getContactName() );
-        merchantBaseInfoVO.setAddressNo( entity.getAddressNo() );
-        merchantBaseInfoVO.setProvince( entity.getProvince() );
-        merchantBaseInfoVO.setCity( entity.getCity() );
-        merchantBaseInfoVO.setDistrict( entity.getDistrict() );
-        merchantBaseInfoVO.setAddress( entity.getAddress() );
-        merchantBaseInfoVO.setEmail( entity.getEmail() );
-        merchantBaseInfoVO.setPrincipalMobile( entity.getPrincipalMobile() );
-        merchantBaseInfoVO.setPrincipalCertType( entity.getPrincipalCertType() );
-        merchantBaseInfoVO.setPrincipalCertNo( entity.getPrincipalCertNo() );
-        merchantBaseInfoVO.setPrincipalPerson( entity.getPrincipalPerson() );
-        merchantBaseInfoVO.setBussAuthName( entity.getBussAuthName() );
-        merchantBaseInfoVO.setBussAuthNum( entity.getBussAuthNum() );
-        merchantBaseInfoVO.setBussAuthAddress( entity.getBussAuthAddress() );
-        merchantBaseInfoVO.setBussAuthStartTime( entity.getBussAuthStartTime() );
-        merchantBaseInfoVO.setBussAuthEndTime( entity.getBussAuthEndTime() );
-        merchantBaseInfoVO.setAllowBankLarge( entity.getAllowBankLarge() );
-        merchantBaseInfoVO.setWxCertStatus( entity.getWxCertStatus() );
-        merchantBaseInfoVO.setCreateDt( entity.getCreateDt() );
-        merchantBaseInfoVO.setUpdateDt( entity.getUpdateDt() );
-        merchantBaseInfoVO.setBuslicType( entity.getBuslicType() );
-        merchantBaseInfoVO.setIsVoice( entity.getIsVoice() );
-        merchantBaseInfoVO.setIsPushWxMessage( entity.getIsPushWxMessage() );
-        merchantBaseInfoVO.setIsUnionPay( entity.getIsUnionPay() );
-        merchantBaseInfoVO.setMd5Key( entity.getMd5Key() );
-        merchantBaseInfoVO.setLimitPay( entity.getLimitPay() );
-        merchantBaseInfoVO.setSubAppId( entity.getSubAppId() );
-        merchantBaseInfoVO.setAppid( entity.getAppid() );
-        merchantBaseInfoVO.setStatus( entity.getStatus() );
-        merchantBaseInfoVO.setMerchantAddress( entity.getMerchantAddress() );
-        merchantBaseInfoVO.setStoreHeadPic( entity.getStoreHeadPic() );
-        merchantBaseInfoVO.setStoreInsidePic( entity.getStoreInsidePic() );
-        merchantBaseInfoVO.setCashPic( entity.getCashPic() );
-        merchantBaseInfoVO.setLiteralPic( entity.getLiteralPic() );
-        merchantBaseInfoVO.setWarrantyPic( entity.getWarrantyPic() );
-        merchantBaseInfoVO.setDealPic( entity.getDealPic() );
-        merchantBaseInfoVO.setAffilatePic( entity.getAffilatePic() );
-        merchantBaseInfoVO.setHandPic( entity.getHandPic() );
-        merchantBaseInfoVO.setMerchantAuditStatus( entity.getMerchantAuditStatus() );
-        merchantBaseInfoVO.setStartTime( entity.getStartTime() );
-        merchantBaseInfoVO.setEndTime( entity.getEndTime() );
-        merchantBaseInfoVO.setImgUrl( entity.getImgUrl() );
-        merchantBaseInfoVO.setLoginName( entity.getLoginName() );
-        merchantBaseInfoVO.setPassword( entity.getPassword() );
-        merchantBaseInfoVO.setLogo( entity.getLogo() );
-        merchantBaseInfoVO.setUserPhone( entity.getUserPhone() );
-        merchantBaseInfoVO.setUserName( entity.getUserName() );
-        merchantBaseInfoVO.setBusinessLicensePic( entity.getBusinessLicensePic() );
-        merchantBaseInfoVO.setLocation( entity.getLocation() );
-        merchantBaseInfoVO.setFirstTradeTime( entity.getFirstTradeTime() );
-        merchantBaseInfoVO.setLastTradeTime( entity.getLastTradeTime() );
-        merchantBaseInfoVO.setSplitFlag( entity.getSplitFlag() );
-        merchantBaseInfoVO.setValidFlag( entity.getValidFlag() );
-
-        return merchantBaseInfoVO;
-    }
-
-    @Override
-    public MerchantBaseInfo vo2domain(MerchantBaseInfoVO entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
-
-        merchantBaseInfo.setId( entity.getId() );
-        merchantBaseInfo.setBindingCode( entity.getBindingCode() );
-        merchantBaseInfo.setUserId( entity.getUserId() );
-        merchantBaseInfo.setAliAccount( entity.getAliAccount() );
-        merchantBaseInfo.setMerchantCode( entity.getMerchantCode() );
-        merchantBaseInfo.setMerchantName( entity.getMerchantName() );
-        merchantBaseInfo.setMerchantType( entity.getMerchantType() );
-        merchantBaseInfo.setProductDesc( entity.getProductDesc() );
-        merchantBaseInfo.setAliMcc( entity.getAliMcc() );
-        merchantBaseInfo.setMcc( entity.getMcc() );
-        merchantBaseInfo.setMccName( entity.getMccName() );
-        merchantBaseInfo.setAlias( entity.getAlias() );
-        merchantBaseInfo.setContactMobile( entity.getContactMobile() );
-        merchantBaseInfo.setContactName( entity.getContactName() );
-        merchantBaseInfo.setAddressNo( entity.getAddressNo() );
-        merchantBaseInfo.setProvince( entity.getProvince() );
-        merchantBaseInfo.setCity( entity.getCity() );
-        merchantBaseInfo.setDistrict( entity.getDistrict() );
-        merchantBaseInfo.setAddress( entity.getAddress() );
-        merchantBaseInfo.setEmail( entity.getEmail() );
-        merchantBaseInfo.setPrincipalMobile( entity.getPrincipalMobile() );
-        merchantBaseInfo.setPrincipalCertType( entity.getPrincipalCertType() );
-        merchantBaseInfo.setPrincipalCertNo( entity.getPrincipalCertNo() );
-        merchantBaseInfo.setPrincipalPerson( entity.getPrincipalPerson() );
-        merchantBaseInfo.setBussAuthName( entity.getBussAuthName() );
-        merchantBaseInfo.setBussAuthNum( entity.getBussAuthNum() );
-        merchantBaseInfo.setBussAuthAddress( entity.getBussAuthAddress() );
-        merchantBaseInfo.setBussAuthStartTime( entity.getBussAuthStartTime() );
-        merchantBaseInfo.setBussAuthEndTime( entity.getBussAuthEndTime() );
-        merchantBaseInfo.setAllowBankLarge( entity.getAllowBankLarge() );
-        merchantBaseInfo.setWxCertStatus( entity.getWxCertStatus() );
-        merchantBaseInfo.setCreateDt( entity.getCreateDt() );
-        merchantBaseInfo.setUpdateDt( entity.getUpdateDt() );
-        merchantBaseInfo.setBuslicType( entity.getBuslicType() );
-        merchantBaseInfo.setIsVoice( entity.getIsVoice() );
-        merchantBaseInfo.setIsPushWxMessage( entity.getIsPushWxMessage() );
-        merchantBaseInfo.setIsUnionPay( entity.getIsUnionPay() );
-        merchantBaseInfo.setMd5Key( entity.getMd5Key() );
-        merchantBaseInfo.setLimitPay( entity.getLimitPay() );
-        merchantBaseInfo.setSubAppId( entity.getSubAppId() );
-        merchantBaseInfo.setAppid( entity.getAppid() );
-        merchantBaseInfo.setStatus( entity.getStatus() );
-        merchantBaseInfo.setMerchantAddress( entity.getMerchantAddress() );
-        merchantBaseInfo.setStoreHeadPic( entity.getStoreHeadPic() );
-        merchantBaseInfo.setStoreInsidePic( entity.getStoreInsidePic() );
-        merchantBaseInfo.setCashPic( entity.getCashPic() );
-        merchantBaseInfo.setLiteralPic( entity.getLiteralPic() );
-        merchantBaseInfo.setWarrantyPic( entity.getWarrantyPic() );
-        merchantBaseInfo.setDealPic( entity.getDealPic() );
-        merchantBaseInfo.setAffilatePic( entity.getAffilatePic() );
-        merchantBaseInfo.setHandPic( entity.getHandPic() );
-        merchantBaseInfo.setMerchantAuditStatus( entity.getMerchantAuditStatus() );
-        merchantBaseInfo.setStartTime( entity.getStartTime() );
-        merchantBaseInfo.setEndTime( entity.getEndTime() );
-        merchantBaseInfo.setImgUrl( entity.getImgUrl() );
-        merchantBaseInfo.setLoginName( entity.getLoginName() );
-        merchantBaseInfo.setPassword( entity.getPassword() );
-        merchantBaseInfo.setLogo( entity.getLogo() );
-        merchantBaseInfo.setUserPhone( entity.getUserPhone() );
-        merchantBaseInfo.setUserName( entity.getUserName() );
-        merchantBaseInfo.setBusinessLicensePic( entity.getBusinessLicensePic() );
-        merchantBaseInfo.setLocation( entity.getLocation() );
-        merchantBaseInfo.setFirstTradeTime( entity.getFirstTradeTime() );
-        merchantBaseInfo.setLastTradeTime( entity.getLastTradeTime() );
-        merchantBaseInfo.setSplitFlag( entity.getSplitFlag() );
-        merchantBaseInfo.setValidFlag( entity.getValidFlag() );
-
-        return merchantBaseInfo;
-    }
-
-    @Override
-    public MerchantBaseInfo dto2Domain(MerchantBaseInfoDTO dto) {
-        if ( dto == null ) {
-            return null;
-        }
-
-        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
-
-        merchantBaseInfo.setId( dto.getId() );
-        merchantBaseInfo.setUserId( dto.getUserId() );
-        merchantBaseInfo.setAliAccount( dto.getAliAccount() );
-        merchantBaseInfo.setMerchantName( dto.getMerchantName() );
-        merchantBaseInfo.setMerchantType( dto.getMerchantType() );
-        merchantBaseInfo.setProductDesc( dto.getProductDesc() );
-        merchantBaseInfo.setMcc( dto.getMcc() );
-        merchantBaseInfo.setMccName( dto.getMccName() );
-        merchantBaseInfo.setAlias( dto.getAlias() );
-        merchantBaseInfo.setContactMobile( dto.getContactMobile() );
-        merchantBaseInfo.setContactName( dto.getContactName() );
-        merchantBaseInfo.setAddressNo( dto.getAddressNo() );
-        merchantBaseInfo.setAddress( dto.getAddress() );
-        merchantBaseInfo.setEmail( dto.getEmail() );
-        merchantBaseInfo.setMerchantAddress( dto.getMerchantAddress() );
-        merchantBaseInfo.setStoreHeadPic( dto.getStoreHeadPic() );
-        merchantBaseInfo.setStoreInsidePic( dto.getStoreInsidePic() );
-        merchantBaseInfo.setCashPic( dto.getCashPic() );
-        merchantBaseInfo.setUserPhone( dto.getUserPhone() );
-
-        return merchantBaseInfo;
-    }
-
-    @Override
-    public MerchantStore baseInfo2StoreInfo(MerchantBaseInfo entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        MerchantStore merchantStore = new MerchantStore();
-
-        merchantStore.setStoreName( entity.getAlias() );
-        merchantStore.setMerchantName( entity.getAlias() );
-        if ( entity.getId() != null ) {
-            merchantStore.setId( entity.getId().intValue() );
-        }
-        merchantStore.setMerchantCode( entity.getMerchantCode() );
-        merchantStore.setCreateDt( entity.getCreateDt() );
-        merchantStore.setStatus( entity.getStatus() );
-        merchantStore.setEmail( entity.getEmail() );
-        merchantStore.setStoreHeadPic( entity.getStoreHeadPic() );
-        merchantStore.setStoreInsidePic( entity.getStoreInsidePic() );
-        merchantStore.setCashPic( entity.getCashPic() );
-        merchantStore.setProductDesc( entity.getProductDesc() );
-        merchantStore.setMerchantType( entity.getMerchantType() );
-        merchantStore.setStartTime( entity.getStartTime() );
-        merchantStore.setEndTime( entity.getEndTime() );
-        merchantStore.setAlias( entity.getAlias() );
-
-        return merchantStore;
-    }
-
-    @Override
-    public UserApp baseInfo2UserApp(MerchantBaseInfo entity) {
-        if ( entity == null ) {
-            return null;
-        }
-
-        UserApp userApp = new UserApp();
-
-        userApp.setId( entity.getId() );
-        userApp.setLoginName( entity.getLoginName() );
-        if ( entity.getUserId() != null ) {
-            userApp.setUserId( Long.parseLong( entity.getUserId() ) );
-        }
-        userApp.setUserName( entity.getUserName() );
-        userApp.setLogo( entity.getLogo() );
-        userApp.setCreateDt( entity.getCreateDt() );
-        userApp.setUpdateDt( entity.getUpdateDt() );
-        if ( entity.getStatus() != null ) {
-            userApp.setStatus( Integer.parseInt( entity.getStatus() ) );
-        }
-        userApp.setMerchantCode( entity.getMerchantCode() );
-        userApp.setMerchantName( entity.getMerchantName() );
-        userApp.setContactName( entity.getContactName() );
-        userApp.setProductDesc( entity.getProductDesc() );
-        userApp.setBussAuthNum( entity.getBussAuthNum() );
-        userApp.setIsVoice( entity.getIsVoice() );
-        userApp.setIsUnionPay( entity.getIsUnionPay() );
-        userApp.setPassword( entity.getPassword() );
-        userApp.setMerchantType( entity.getMerchantType() );
-        userApp.setAlias( entity.getAlias() );
-        userApp.setMerchantAuditStatus( entity.getMerchantAuditStatus() );
-
-        return userApp;
-    }
-
-    @Override
-    public List<MerchantBaseInfoDTO> domain2dto(List<MerchantBaseInfo> entityList) {
-        if ( entityList == null ) {
-            return null;
-        }
-
-        List<MerchantBaseInfoDTO> list = new ArrayList<MerchantBaseInfoDTO>( entityList.size() );
-        for ( MerchantBaseInfo merchantBaseInfo : entityList ) {
-            list.add( domain2dto( merchantBaseInfo ) );
-        }
-
-        return list;
-    }
-}
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java
deleted file mode 100644
index bf8b200..0000000
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.pluss.platform.converter;
-
-import cn.pluss.platform.entity.MerchantCashPlace;
-import cn.pluss.platform.vo.MerchantCashPlaceVO;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-01-30T11:00:04+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
-)
-public class MerchantCashPlaceConverterImpl implements MerchantCashPlaceConverter {
-
-    @Override
-    public MerchantCashPlaceVO entity2VO(MerchantCashPlace merchantCashPlace) {
-        if ( merchantCashPlace == null ) {
-            return null;
-        }
-
-        MerchantCashPlaceVO merchantCashPlaceVO = new MerchantCashPlaceVO();
-
-        merchantCashPlaceVO.setId( merchantCashPlace.getId() );
-        merchantCashPlaceVO.setUserId( merchantCashPlace.getUserId() );
-        merchantCashPlaceVO.setName( merchantCashPlace.getName() );
-        merchantCashPlaceVO.setCode( merchantCashPlace.getCode() );
-        merchantCashPlaceVO.setAddress( merchantCashPlace.getAddress() );
-        merchantCashPlaceVO.setRemark( merchantCashPlace.getRemark() );
-        merchantCashPlaceVO.setCreateTime( merchantCashPlace.getCreateTime() );
-        merchantCashPlaceVO.setUpdateTime( merchantCashPlace.getUpdateTime() );
-
-        return merchantCashPlaceVO;
-    }
-}
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java
deleted file mode 100644
index bfcda51..0000000
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.pluss.platform.converter;
-
-import cn.pluss.platform.dto.MerchantStaffDTO;
-import cn.pluss.platform.entity.UserInfo;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-01-30T11:00:03+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
-)
-public class MerchantStaffConverterImpl implements MerchantStaffConverter {
-
-    @Override
-    public UserInfo toUserInfo(MerchantStaffDTO merchantStaffDTO) {
-        if ( merchantStaffDTO == null ) {
-            return null;
-        }
-
-        UserInfo userInfo = new UserInfo();
-
-        userInfo.setId( merchantStaffDTO.getUserId() );
-        userInfo.setLoginName( merchantStaffDTO.getLoginName() );
-        userInfo.setPhone( merchantStaffDTO.getPhone() );
-        userInfo.setPassword( merchantStaffDTO.getPassword() );
-        userInfo.setMerchantCode( merchantStaffDTO.getMerchantCode() );
-
-        return userInfo;
-    }
-}
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java
deleted file mode 100644
index c3af087..0000000
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package cn.pluss.platform.converter;
-
-import cn.pluss.platform.entity.MerchantBaseInfo;
-import cn.pluss.platform.entity.MerchantStore;
-import cn.pluss.platform.entity.UserApp;
-import cn.pluss.platform.entity.UserInfo;
-import java.text.SimpleDateFormat;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-01-30T11:00:03+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
-)
-public class UserAppConverterImpl implements UserAppConverter {
-
-    @Override
-    public void copyProperties(MerchantStore merchantStore, UserApp userApp) {
-        if ( merchantStore == null ) {
-            return;
-        }
-
-        if ( merchantStore.getId() != null ) {
-            userApp.setStoreId2( String.valueOf( merchantStore.getId() ) );
-        }
-        if ( merchantStore.getCreateDt() != null ) {
-            userApp.setCreateDt( merchantStore.getCreateDt() );
-        }
-        if ( merchantStore.getMerchantCode() != null ) {
-            userApp.setMerchantCode( merchantStore.getMerchantCode() );
-        }
-        if ( merchantStore.getMerchantName() != null ) {
-            userApp.setMerchantName( merchantStore.getMerchantName() );
-        }
-        if ( merchantStore.getStoreName() != null ) {
-            userApp.setStoreName( merchantStore.getStoreName() );
-        }
-        if ( merchantStore.getStoreId() != null ) {
-            userApp.setStoreId( merchantStore.getStoreId() );
-        }
-        if ( merchantStore.getProductDesc() != null ) {
-            userApp.setProductDesc( merchantStore.getProductDesc() );
-        }
-        if ( merchantStore.getPayEcdemicSwitch() != null ) {
-            userApp.setPayEcdemicSwitch( merchantStore.getPayEcdemicSwitch() );
-        }
-        if ( merchantStore.getIsMarket() != null ) {
-            userApp.setIsMarket( merchantStore.getIsMarket() );
-        }
-        if ( merchantStore.getMerchantType() != null ) {
-            userApp.setMerchantType( merchantStore.getMerchantType() );
-        }
-        if ( merchantStore.getAlias() != null ) {
-            userApp.setAlias( merchantStore.getAlias() );
-        }
-        if ( merchantStore.getMcsStatus() != null ) {
-            userApp.setMcsStatus( merchantStore.getMcsStatus() );
-        }
-    }
-
-    @Override
-    public void copyProperties(MerchantBaseInfo merchantBaseInfo, UserApp userApp) {
-        if ( merchantBaseInfo == null ) {
-            return;
-        }
-
-        if ( merchantBaseInfo.getAlias() != null ) {
-            userApp.setMerchantName( merchantBaseInfo.getAlias() );
-        }
-        if ( merchantBaseInfo.getId() != null ) {
-            userApp.setMercId( merchantBaseInfo.getId() );
-        }
-        if ( merchantBaseInfo.getLoginName() != null ) {
-            userApp.setLoginName( merchantBaseInfo.getLoginName() );
-        }
-        if ( merchantBaseInfo.getUserId() != null ) {
-            userApp.setUserId( Long.parseLong( merchantBaseInfo.getUserId() ) );
-        }
-        if ( merchantBaseInfo.getUserName() != null ) {
-            userApp.setUserName( merchantBaseInfo.getUserName() );
-        }
-        if ( merchantBaseInfo.getLogo() != null ) {
-            userApp.setLogo( merchantBaseInfo.getLogo() );
-        }
-        if ( merchantBaseInfo.getCreateDt() != null ) {
-            userApp.setCreateDt( merchantBaseInfo.getCreateDt() );
-        }
-        if ( merchantBaseInfo.getUpdateDt() != null ) {
-            userApp.setUpdateDt( merchantBaseInfo.getUpdateDt() );
-        }
-        if ( merchantBaseInfo.getMerchantCode() != null ) {
-            userApp.setMerchantCode( merchantBaseInfo.getMerchantCode() );
-        }
-        if ( merchantBaseInfo.getContactName() != null ) {
-            userApp.setContactName( merchantBaseInfo.getContactName() );
-        }
-        if ( merchantBaseInfo.getProductDesc() != null ) {
-            userApp.setProductDesc( merchantBaseInfo.getProductDesc() );
-        }
-        if ( merchantBaseInfo.getBussAuthNum() != null ) {
-            userApp.setBussAuthNum( merchantBaseInfo.getBussAuthNum() );
-        }
-        if ( merchantBaseInfo.getIsVoice() != null ) {
-            userApp.setIsVoice( merchantBaseInfo.getIsVoice() );
-        }
-        if ( merchantBaseInfo.getIsUnionPay() != null ) {
-            userApp.setIsUnionPay( merchantBaseInfo.getIsUnionPay() );
-        }
-        if ( merchantBaseInfo.getPassword() != null ) {
-            userApp.setPassword( merchantBaseInfo.getPassword() );
-        }
-        if ( merchantBaseInfo.getMerchantType() != null ) {
-            userApp.setMerchantType( merchantBaseInfo.getMerchantType() );
-        }
-        if ( merchantBaseInfo.getAlias() != null ) {
-            userApp.setAlias( merchantBaseInfo.getAlias() );
-        }
-        if ( merchantBaseInfo.getMerchantAuditStatus() != null ) {
-            userApp.setMerchantAuditStatus( merchantBaseInfo.getMerchantAuditStatus() );
-        }
-    }
-
-    @Override
-    public UserApp toUserApp(UserInfo userInfo) {
-        if ( userInfo == null ) {
-            return null;
-        }
-
-        UserApp userApp = new UserApp();
-
-        userApp.setCreateDt( userInfo.getCreateTime() );
-        userApp.setUserId( userInfo.getId() );
-        userApp.setLoginName( userInfo.getLoginName() );
-        userApp.setStatus( userInfo.getStatus() );
-        if ( userInfo.getParentId() != null ) {
-            userApp.setParentId( userInfo.getParentId().longValue() );
-        }
-        userApp.setPhone( userInfo.getPhone() );
-        userApp.setMerchantCode( userInfo.getMerchantCode() );
-        userApp.setStoreId( userInfo.getStoreId() );
-        userApp.setPassword( userInfo.getPassword() );
-        if ( userInfo.getUpdateTime() != null ) {
-            userApp.setUpdateTime( new SimpleDateFormat().format( userInfo.getUpdateTime() ) );
-        }
-        userApp.setPayPassword( userInfo.getPayPassword() );
-        userApp.setFaceCert( userInfo.getFaceCert() );
-        userApp.setFaceCompare( userInfo.getFaceCompare() );
-
-        return userApp;
-    }
-}
diff --git a/pluss-parent.iml b/pluss-parent.iml
index bc24aca..90c21a1 100644
--- a/pluss-parent.iml
+++ b/pluss-parent.iml
@@ -25,6 +25,8 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/pluss-service-bundle/pluss-service-bundle.iml b/pluss-service-bundle/pluss-service-bundle.iml
index e69fd6c..7497b40 100644
--- a/pluss-service-bundle/pluss-service-bundle.iml
+++ b/pluss-service-bundle/pluss-service-bundle.iml
@@ -34,6 +34,8 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -98,8 +100,6 @@
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
     <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.5.5" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
     <orderEntry type="library" name="Maven: cn.jpush.api:jiguang-common:1.1.12" level="project" />
     <orderEntry type="library" name="Maven: com.mob.push.sdk:mobpush-websdkv3-java:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.1.0.RELEASE" level="project" />
@@ -113,17 +113,6 @@
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.21" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
-    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
     <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.16.11.ALL" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
     <orderEntry type="library" name="Maven: xml-security:xmlsec:1.3.0" level="project" />
@@ -133,8 +122,6 @@
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.75" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.23" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.23" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.9.1" level="project" />
@@ -223,6 +210,26 @@
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.1.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.11" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.13" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.65" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.2.71" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71" level="project" />
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
index 5c4c4fd..9ec8863 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
@@ -96,8 +96,8 @@ public class GeneralPushUtil implements IPush {
     @Override
     public void sendAllPlatAll(String notificationTitle, String msgContent, String extrasParam) {
         try {
-            jgPushUtil.sendAndroidAll(notificationTitle, msgContent, extrasParam);
-            mobPushUtil.sendIOSAll(notificationTitle, msgContent, extrasParam);
+            //jgPushUtil.sendAndroidAll(notificationTitle, msgContent, extrasParam);
+            //mobPushUtil.sendIOSAll(notificationTitle, msgContent, extrasParam);
             getuiPushUtil.sendIOSAll(notificationTitle, msgContent, extrasParam);
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class b/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class
deleted file mode 100644
index 203ccb3..0000000
Binary files a/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class and /dev/null differ
diff --git a/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class b/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class
deleted file mode 100644
index ae40f94..0000000
Binary files a/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class and /dev/null differ
diff --git a/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class b/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class
deleted file mode 100644
index b390ae7..0000000
Binary files a/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class and /dev/null differ
diff --git a/pluss-wap-page/pluss-wap-page.iml b/pluss-wap-page/pluss-wap-page.iml
index 773e4ef..a5cf495 100644
--- a/pluss-wap-page/pluss-wap-page.iml
+++ b/pluss-wap-page/pluss-wap-page.iml
@@ -213,6 +213,15 @@
     <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
     <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.12" level="project" />