合并分支 'dxy' 到 'master'

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityClockCoreController.java

@@ -163,7 +163,6 @@ public class TemporaryActivityClockCoreController {
         clockDto.setPlanId(clockVo.getPlanId())
                 .setStoreId(clockVo.getStoreId())
                 .setStoreName(clockVo.getStoreName())
-                .setClockInAddress(clockVo.getClockAddress())
                 .setClockInCoordinates(clockVo.getClockCoordinates())
                 .setClockInPhoto(clockVo.getClockPhoto())
                 .setClockInTime(dateTime);
@@ -172,7 +171,6 @@ public class TemporaryActivityClockCoreController {
     // 午休下班卡
     private void builderNoonClockOutData(TemporaryClockVo clockVo, TemporaryClockDto clockDto, Date dateTime) {
         clockDto.setId(clockVo.getId())
-                .setNoonClockOutAddress(clockVo.getClockAddress())
                 .setNoonClockOutCoordinates(clockVo.getClockCoordinates())
                 .setNoonClockOutPhoto(clockVo.getClockPhoto())
                 .setNoonClockOutTime(dateTime);
@@ -182,7 +180,6 @@ public class TemporaryActivityClockCoreController {
     // 午休上班卡
     private void builderNoonClockInData(TemporaryClockVo clockVo, TemporaryClockDto clockDto, Date dateTime) {
         clockDto.setId(clockVo.getId())
-                .setNoonClockInAddress(clockVo.getClockAddress())
                 .setNoonClockInCoordinates(clockVo.getClockCoordinates())
                 .setNoonClockInPhoto(clockVo.getClockPhoto())
                 .setNoonClockInTime(dateTime);
@@ -191,7 +188,6 @@ public class TemporaryActivityClockCoreController {
     // 下班卡
     private void builderClockOutData(TemporaryClockVo clockVo, TemporaryClockDto clockDto, Date dateTime) {
         clockDto.setId(clockVo.getId())
-//                .setClockOutAddress(clockVo.getClockAddress())
                 .setClockOutCoordinates(clockVo.getClockCoordinates())
                 .setClockOutPhoto(clockVo.getClockPhoto())
                 .setClockOutTime(dateTime);

src/main/resources/application-dev.yml

@@ -112,8 +112,8 @@ xxl:
       logpath: /Users/a02200059/Desktop/wangxiaolu-sfa/log/xxl_job # 执行器日志路径
 
 aliyun:
-  access-key-id: LTAI5tA61gKJeoV6pSt3U7gr
-  access-key-secret: 1ba0nuy43d85bEKihuMifsJNfIyWOC
+  access-key-id: LTAI5t5ew5aihizVZW7VaTva
+  access-key-secret: TUnq1G7pjvSU5NAv6GBEEbJJyu79Ju
   oss:
     region-id: cn-shanghai
     sts-role-arm: acs:ram::1819206190412770:role/oss-admin-role

src/main/resources/application-qa.yml

@@ -109,8 +109,8 @@ xxl:
       logpath: /var/logs/xxl_job
 
 aliyun:
-  access-key-id: LTAI5tA61gKJeoV6pSt3U7gr
-  access-key-secret: 1ba0nuy43d85bEKihuMifsJNfIyWOC
+  access-key-id: LTAI5t5ew5aihizVZW7VaTva
+  access-key-secret: TUnq1G7pjvSU5NAv6GBEEbJJyu79Ju
   oss:
     region-id: cn-shanghai
     sts-role-arm: acs:ram::1819206190412770:role/oss-admin-role