'修改引用包'

.idea/libraries/Maven__com_huifu_adapay_adapay_java_sdk_1_2_10.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.huifu.adapay:adapay-java-sdk:1.2.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/adapay-java-sdk/1.2.10/adapay-java-sdk-1.2.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/adapay-java-sdk/1.2.10/adapay-java-sdk-1.2.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/adapay-java-sdk/1.2.10/adapay-java-sdk-1.2.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_huifu_adapay_core_adapay_core_sdk_1_2_10.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.huifu.adapay.core:adapay-core-sdk:1.2.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/core/adapay-core-sdk/1.2.10/adapay-core-sdk-1.2.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/core/adapay-core-sdk/1.2.10/adapay-core-sdk-1.2.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/adapay/core/adapay-core-sdk/1.2.10/adapay-core-sdk-1.2.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_huifu_dg_demo_3_0_1_sources_3_0_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.huifu:dg-demo-3.0.1-sources:3.0.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-demo-3.0.1-sources/3.0.1/dg-demo-3.0.1-sources-3.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-demo-3.0.1-sources/3.0.1/dg-demo-3.0.1-sources-3.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huifu/dg-demo-3.0.1-sources/3.0.1/dg-demo-3.0.1-sources-3.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__junit_junit_4_12.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_12.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpmime:4.5.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.12/httpmime-4.5.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.12/httpmime-4.5.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.12/httpmime-4.5.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.0/org.eclipse.paho.client.mqttv3-1.2.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.0/org.eclipse.paho.client.mqttv3-1.2.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.0/org.eclipse.paho.client.mqttv3-1.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/workspace.xml

@@ -26,16 +26,29 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d95263d0-9dff-44b4-8deb-343711f78d5d" name="Default Changelist" comment="针对退款时将所有的订单信息进行退款2021-10-15">
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_adapay_adapay_java_sdk_1_2_10.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_adapay_core_adapay_core_sdk_1_2_10.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_dg_demo_3_0_1_sources_3_0_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_dg_java_sdk_3_0_1_3_0_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_dg_java_sdk_3_0_1_sources_3_0_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_12.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/out/artifacts/SAAS_AFTEREND2_jar/SAAS-AFTEREND2.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/SAAS_AFTEREND2_jar/SAAS-AFTEREND2.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/ShiftClassController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/ShiftClassController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/ShiftClassController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/ShiftClassController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/ShiftClass.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/ShiftMaskMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IShiftMaskService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/ShiftMaskServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/ShiftClassMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/ShiftClassMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/ShiftClassMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/yijia-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/yijia-admin.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/yijia-common-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/yijia-common-1.0.1.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/yijia-station-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/yijia-station-1.0.1.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/yijia-station.iml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/yijia-station.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -309,7 +322,7 @@
       <workItem from="1665190910176" duration="2359000" />
       <workItem from="1665277043309" duration="10334000" />
       <workItem from="1665622771275" duration="5158000" />
-      <workItem from="1665709084314" duration="5176000" />
+      <workItem from="1665709084314" duration="9290000" />
     </task>
     <task id="LOCAL-00001" summary="前端配置文件package-config.json删除">
       <created>1619772586309</created>
@@ -717,62 +730,62 @@
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
     <state x="740" y="341" key="FileChooserDialogImpl/0.0.1920.1160@0.0.1920.1160" timestamp="1664420679024" />
-    <state width="1860" height="337" key="GridCell.Tab.0.bottom" timestamp="1665716863878">
+    <state width="1860" height="337" key="GridCell.Tab.0.bottom" timestamp="1665729905724">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863878" />
-    <state width="1860" height="337" key="GridCell.Tab.0.center" timestamp="1665716863878">
+    <state width="1860" height="337" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905724" />
+    <state width="1860" height="337" key="GridCell.Tab.0.center" timestamp="1665729905723">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863878" />
-    <state width="1860" height="337" key="GridCell.Tab.0.left" timestamp="1665716863878">
+    <state width="1860" height="337" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905723" />
+    <state width="1860" height="337" key="GridCell.Tab.0.left" timestamp="1665729905723">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863878" />
-    <state width="1860" height="337" key="GridCell.Tab.0.right" timestamp="1665716863878">
+    <state width="1860" height="337" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905723" />
+    <state width="1860" height="337" key="GridCell.Tab.0.right" timestamp="1665729905724">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863878" />
-    <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1665716863711">
+    <state width="1860" height="337" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905724" />
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1665729905576">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
-    <state width="1860" height="337" key="GridCell.Tab.1.center" timestamp="1665716863711">
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905576" />
+    <state width="1860" height="337" key="GridCell.Tab.1.center" timestamp="1665729905576">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
-    <state width="1860" height="337" key="GridCell.Tab.1.left" timestamp="1665716863710">
+    <state width="1860" height="337" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905576" />
+    <state width="1860" height="337" key="GridCell.Tab.1.left" timestamp="1665729905576">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863710" />
-    <state width="1860" height="337" key="GridCell.Tab.1.right" timestamp="1665716863711">
+    <state width="1860" height="337" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905576" />
+    <state width="1860" height="337" key="GridCell.Tab.1.right" timestamp="1665729905576">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
-    <state width="1860" height="337" key="GridCell.Tab.2.bottom" timestamp="1665716863711">
+    <state width="1860" height="337" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905576" />
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom" timestamp="1665729905576">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
-    <state width="1860" height="337" key="GridCell.Tab.2.center" timestamp="1665716863711">
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905576" />
+    <state width="1860" height="337" key="GridCell.Tab.2.center" timestamp="1665729905576">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
-    <state width="1860" height="337" key="GridCell.Tab.2.left" timestamp="1665716863711">
+    <state width="1860" height="337" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905576" />
+    <state width="1860" height="337" key="GridCell.Tab.2.left" timestamp="1665729905576">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
-    <state width="1860" height="337" key="GridCell.Tab.2.right" timestamp="1665716863711">
+    <state width="1860" height="337" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905576" />
+    <state width="1860" height="337" key="GridCell.Tab.2.right" timestamp="1665729905576">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
+    <state width="1860" height="337" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665729905576" />
     <state x="461" y="231" key="SettingsEditor" timestamp="1663724002207">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
     <state x="461" y="231" key="SettingsEditor/0.0.1920.1160@0.0.1920.1160" timestamp="1663724002207" />
-    <state x="660" y="289" width="599" height="616" key="find.popup" timestamp="1658455635376">
+    <state x="660" y="289" width="599" height="616" key="find.popup" timestamp="1665731815797">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state x="660" y="289" width="599" height="616" key="find.popup/0.0.1920.1160@0.0.1920.1160" timestamp="1658455635376" />
+    <state x="660" y="289" width="599" height="616" key="find.popup/0.0.1920.1160@0.0.1920.1160" timestamp="1665731815797" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

yijia-admin/yijia-admin.iml

@@ -143,13 +143,6 @@
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: org.saobei:saobeiopen:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.huifu.adapay.core:adapay-core-sdk:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.huifu.adapay:adapay-java-sdk:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.huifu:dg-demo-3.0.1-sources:3.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.huifu:dg-java-sdk-3.0.1:3.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.huifu:dg-java-sdk-3.0.1-sources:3.0.1" level="project" />
     <orderEntry type="module" module-name="yijia-customer" />

yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -23,6 +23,7 @@ D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\h
 D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\page\PageDomain.java
 D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\reflect\ReflectUtils.java
 D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\utils\sql\SqlUtil.java
+D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\entity\ShiftClass.java
 D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\annotation\Excels.java
 D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\text\CharsetKit.java
 D:\java项目\SAAS-AFTEREND2\yijia-common\src\main\java\com\yijia\common\core\domain\entity\SysDictType.java

yijia-station/pom.xml

@@ -31,25 +31,25 @@
             <version>1.0</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.huifu.adapay.core/adapay-core-sdk -->
-        <dependency>
-            <groupId>com.huifu.adapay.core</groupId>
-            <artifactId>adapay-core-sdk</artifactId>
-            <version>1.2.10</version>
-        </dependency>
+<!--        &lt;!&ndash; https://mvnrepository.com/artifact/com.huifu.adapay.core/adapay-core-sdk &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.huifu.adapay.core</groupId>-->
+<!--            <artifactId>adapay-core-sdk</artifactId>-->
+<!--            <version>1.2.10</version>-->
+<!--        </dependency>-->
 
-        <!-- https://mvnrepository.com/artifact/com.huifu.adapay/adapay-java-sdk -->
-        <dependency>
-            <groupId>com.huifu.adapay</groupId>
-            <artifactId>adapay-java-sdk</artifactId>
-            <version>1.2.10</version>
-        </dependency>
+<!--        &lt;!&ndash; https://mvnrepository.com/artifact/com.huifu.adapay/adapay-java-sdk &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.huifu.adapay</groupId>-->
+<!--            <artifactId>adapay-java-sdk</artifactId>-->
+<!--            <version>1.2.10</version>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>com.huifu</groupId>
-            <artifactId>dg-demo-3.0.1-sources</artifactId>
-            <version>3.0.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.huifu</groupId>-->
+<!--            <artifactId>dg-demo-3.0.1-sources</artifactId>-->
+<!--            <version>3.0.1</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.huifu</groupId>

yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -38,7 +38,6 @@ com\yijia\station\service\IStationOilPriceService.class
 com\yijia\station\mapper\StationClassesSummaryMapper.class
 com\yijia\station\domain\SysDeptDemo.class
 com\yijia\station\domain\StationOilPriceAdjust.class
-com\yijia\station\mapper\ShiftMaskMapper.class
 com\yijia\station\controller\StationInfoController.class
 com\yijia\station\domain\StationOilGun.class
 com\yijia\station\utils\HttpUtils.class
@@ -49,9 +48,7 @@ com\yijia\station\controller\SysAppUserInfoController.class
 com\yijia\station\utils\SignUtils.class
 com\yijia\station\service\IStationNoticeService.class
 com\yijia\station\service\impl\StationOilPriceAdjustServiceImpl.class
-com\yijia\station\service\IShiftMaskService.class
 com\yijia\station\controller\RSAEncrypt.class
-com\yijia\station\domain\ShiftClass.class
 com\yijia\station\service\IStationSettlementPriceService.class
 com\yijia\station\controller\ShiftClassController.class
 com\yijia\station\controller\StationDeviceManageController.class
@@ -89,7 +86,6 @@ com\yijia\station\domain\StationNotice.class
 com\yijia\station\domain\DeptInfoDemo.class
 com\yijia\station\service\impl\StationClassStructureServiceImpl.class
 com\yijia\station\domain\StationDeviceManage.class
-com\yijia\station\service\impl\ShiftMaskServiceImpl.class
 com\yijia\station\service\impl\StationPersonnelServiceImpl.class
 com\yijia\station\service\IStationDeviceManageService.class
 com\yijia\station\domain\StationInfo.class

yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -31,7 +31,6 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationSettlementPriceAdjust.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationSettlementPriceAdjustMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\SysAppUserInfoController.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\ShiftMaskServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationClassStructureServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationDeviceManageService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationOilGunController.java
@@ -51,7 +50,6 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\contr
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationSettlementPriceServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationSettlementPrice.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\SysDeptDemo.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\ShiftClass.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\SignUtil.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceAdjustServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IPayOrderService.java
@@ -84,7 +82,6 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domai
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationOilPrice.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationDeviceManageMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationOilGunService.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\ShiftMaskMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationPicService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationNoticeController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationOilPriceAdjustMapper.java
@@ -94,7 +91,6 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mappe
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\SXFPaySign.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationPayController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\ApiResponseBean.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IShiftMaskService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\utils\HuiFuUtils.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\DeptInfoDemo.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilGunServiceImpl.java

yijia-station/yijia-station.iml

@@ -20,15 +20,6 @@
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: org.saobei:saobeiopen:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.huifu.adapay.core:adapay-core-sdk:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Maven: com.huifu.adapay:adapay-java-sdk:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.huifu:dg-demo-3.0.1-sources:3.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.huifu:dg-java-sdk-3.0.1:3.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.huifu:dg-java-sdk-3.0.1-sources:3.0.1" level="project" />
     <orderEntry type="module" module-name="yijia-common" />
@@ -66,9 +57,11 @@
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.6" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />

yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -43,17 +43,20 @@ D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysAppUserInfo.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysUserRole.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysAppUserInfoImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\ShiftMaskServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysRoleServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysAgentServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysOperLog.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysUserPost.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysUserOnlineServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\ISysPostService.java
+D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\IShiftMaskService.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysPostMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysUserOnline.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\vo\RouterVo.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysUserRoleMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysConfigServiceImpl.java
+D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\ShiftMaskMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\ISysNoticeService.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysDictDataMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysOperLogMapper.java