'修改班次时间段'

.idea/workspace.xml

@@ -26,21 +26,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d95263d0-9dff-44b4-8deb-343711f78d5d" name="Default Changelist" comment="针对退款时将所有的订单信息进行退款2021-10-15">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_adapay_adapay_java_sdk_1_2_10.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_adapay_core_adapay_core_sdk_1_2_10.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_huifu_dg_demo_3_0_1_sources_3_0_1.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_12.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/application-druid.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/application-druid.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/maven-archiver/pom.properties" 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" beforeDir="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-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.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-coupon/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" afterDir="false" />
@@ -58,19 +50,11 @@
       <change beforePath="$PROJECT_DIR$/yijia-market/target/yijia-market-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/yijia-market-1.0.1.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-quartz/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-quartz/target/yijia-quartz-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-quartz/target/yijia-quartz-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/src/main/java/com/yijia/station/controller/PayOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/META-INF/yijia-station.kotlin_module" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/PayOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/PayOrderController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IPayOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IPayOrderService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/PayOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/PayOrderMapper.xml" 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/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-archiver/pom.properties" 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-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.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" />
@@ -345,7 +329,7 @@
       <workItem from="1665190910176" duration="2359000" />
       <workItem from="1665277043309" duration="10334000" />
       <workItem from="1665622771275" duration="5158000" />
-      <workItem from="1665709084314" duration="24188000" />
+      <workItem from="1665709084314" duration="26870000" />
     </task>
     <task id="LOCAL-00001" summary="前端配置文件package-config.json删除">
       <created>1619772586309</created>
@@ -753,22 +737,22 @@
       <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="318" key="GridCell.Tab.0.bottom" timestamp="1666167865573">
+    <state width="1860" height="318" key="GridCell.Tab.0.bottom" timestamp="1666171229866">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="318" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1666167865573" />
-    <state width="1860" height="318" key="GridCell.Tab.0.center" timestamp="1666167865573">
+    <state width="1860" height="318" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1666171229866" />
+    <state width="1860" height="318" key="GridCell.Tab.0.center" timestamp="1666171229866">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="318" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1666167865573" />
-    <state width="1860" height="318" key="GridCell.Tab.0.left" timestamp="1666167865573">
+    <state width="1860" height="318" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1666171229866" />
+    <state width="1860" height="318" key="GridCell.Tab.0.left" timestamp="1666171229866">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="318" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1666167865573" />
-    <state width="1860" height="318" key="GridCell.Tab.0.right" timestamp="1666167865573">
+    <state width="1860" height="318" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1666171229866" />
+    <state width="1860" height="318" key="GridCell.Tab.0.right" timestamp="1666171229866">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="318" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1666167865573" />
+    <state width="1860" height="318" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1666171229866" />
     <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1666058203693">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>

yijia-admin/target/classes/application-druid.yml

@@ -8,9 +8,12 @@ spring:
             master:
                 #url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://39.101.135.83:33306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: yunwei
-                password: yunwei1qaz
+#                url: jdbc:mysql://39.101.135.83:33306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: yunwei
+#                password: yunwei1qaz
+                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
+                username: develop
+                password: 1234.Abcd
                 #url: jdbc:mysql://localhost:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 # username: zgc
                 #password: 123456

yijia-admin/target/classes/application.yml

@@ -68,34 +68,12 @@ spring:
       # 热部署开关
       enabled: true
   # redis 配置
-#  redis:
-#    # 地址
-#    host: localhost
-#    # 端口，默认为6379
-#    port: 6379
-#    # 密码
-#    password:
-#    # 连接超时时间
-#    timeout: 10s
-#    lettuce:
-#      pool:
-#        # 连接池中的最小空闲连接
-#        min-idle: 0
-#        # 连接池中的最大空闲连接
-#        max-idle: 8
-#        # 连接池的最大数据库连接数
-#        max-active: 8
-#        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-#        max-wait: -1ms
   redis:
     # 地址
-    host: 39.101.135.83
-    #host: localhost
+    host: localhost
     # 端口，默认为6379
     port: 6379
-    #port: 6379
     # 密码
-    #password: oFKUqwahRDriBnYX
     password:
     # 连接超时时间
     timeout: 10s
@@ -109,6 +87,28 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
+#  redis:
+#    # 地址
+#    host: 39.101.135.83
+#    #host: localhost
+#    # 端口，默认为6379
+#    port: 6379
+#    #port: 6379
+#    # 密码
+#    #password: oFKUqwahRDriBnYX
+#    password:
+#    # 连接超时时间
+#    timeout: 10s
+#    lettuce:
+#      pool:
+#        # 连接池中的最小空闲连接
+#        min-idle: 0
+#        # 连接池中的最大空闲连接
+#        max-idle: 8
+#        # 连接池的最大数据库连接数
+#        max-active: 8
+#        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+#        max-wait: -1ms
 # token配置
 token:
     # 令牌自定义标识

yijia-admin/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:42 CST 2022
+#Wed Oct 19 17:20:44 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-admin

yijia-common/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:32 CST 2022
+#Wed Oct 19 17:20:35 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-common

yijia-coupon/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:37 CST 2022
+#Wed Oct 19 17:20:39 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-coupon

yijia-customer/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:38 CST 2022
+#Wed Oct 19 17:20:41 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-customer

yijia-framework/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:34 CST 2022
+#Wed Oct 19 17:20:38 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-framework

yijia-generator/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:36 CST 2022
+#Wed Oct 19 17:20:39 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-generator

yijia-integral/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:38 CST 2022
+#Wed Oct 19 17:20:41 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-integral

yijia-label/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:37 CST 2022
+#Wed Oct 19 17:20:40 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-label

yijia-market/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:40 CST 2022
+#Wed Oct 19 17:20:43 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-market

yijia-quartz/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:35 CST 2022
+#Wed Oct 19 17:20:38 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-quartz

yijia-station/src/main/java/com/yijia/station/controller/ShiftClassController.java

@@ -40,7 +40,6 @@ public class ShiftClassController extends BaseController
         startPage();
         shiftClass.setDelFlag("0");
         List<ShiftClass> shiftClassList = shiftMaskService.selectShiftClassList(shiftClass);
-        shiftClassList.get(0).getCreateTime().getTime();
         return getDataTable(shiftClassList);
     }
 

yijia-station/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:40 CST 2022
+#Wed Oct 19 17:20:43 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-station

yijia-system/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Oct 19 16:24:33 CST 2022
+#Wed Oct 19 17:20:36 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-system