合并分支 'dxy' 到 'master'

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

@@ -191,7 +191,7 @@ public class TemporaryActivityClockCoreController {
     // 下班卡
     private void builderClockOutData(TemporaryClockVo clockVo, TemporaryClockDto clockDto, Date dateTime) {
         clockDto.setId(clockVo.getId())
-                .setClockOutAddress(clockVo.getClockAddress())
+//                .setClockOutAddress(clockVo.getClockAddress())
                 .setClockOutCoordinates(clockVo.getClockCoordinates())
                 .setClockOutPhoto(clockVo.getClockPhoto())
                 .setClockOutTime(dateTime);