diff --git a/evo-admin/pom.xml b/evo-admin/pom.xml
index e967172..4077ee3 100644
--- a/evo-admin/pom.xml
+++ b/evo-admin/pom.xml
@@ -239,6 +239,7 @@
                 <version>2.5.15</version>
                 <configuration>
                     <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                    <includeSystemScope>true</includeSystemScope>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/evo-admin/src/main/java/com/evo/attendance/processor/KqUtils.java b/evo-admin/src/main/java/com/evo/attendance/processor/KqUtils.java
index 307f799..525289d 100644
--- a/evo-admin/src/main/java/com/evo/attendance/processor/KqUtils.java
+++ b/evo-admin/src/main/java/com/evo/attendance/processor/KqUtils.java
@@ -147,7 +147,7 @@ public class KqUtils {
          * B) 公司检查发现的按层级组织秩序，激励责任管理岗两级各-100元/项/次。
          */
         if(!rzAttendanceDetail.getButtonType().contains("12") && !rzAttendanceDetail.getButtonType().contains("三班")){
-            minutes = minutes.subtract(new BigDecimal(ParamUtils.getShortBreakDeductionMinutes()));
+            minutes = minutes.subtract(new BigDecimal(ParamUtils.getShortBreakDeductionMinutes("ZC")));
         }
         //设置默认加班0小时
         double hours = 0;
diff --git a/evo-admin/src/main/java/com/evo/attendance/processor/impl/TSDeviceExchangeProcessor.java b/evo-admin/src/main/java/com/evo/attendance/processor/impl/TSDeviceExchangeProcessor.java
index 05a945c..212775d 100644
--- a/evo-admin/src/main/java/com/evo/attendance/processor/impl/TSDeviceExchangeProcessor.java
+++ b/evo-admin/src/main/java/com/evo/attendance/processor/impl/TSDeviceExchangeProcessor.java
@@ -151,7 +151,7 @@ public class TSDeviceExchangeProcessor implements PunchTheClockStrategyExchangeP
             Long overMinutes = DateUtils.getBetweenMinutes(rzSpecialAttendance.getWorkStartTime(), rzSpecialAttendance.getWorkEndTime());
             //核查当前人员, 当天是否吃完饭 //如果吃晚饭, 扣减30分钟
             if((rzSpecialAttendance.getWorkStartTime().compareTo(endMealDate) <= 0) && (rzRestaurantDetailMapper.checkDinnerByStaffIdAndDateAndSign(sysStaff.getUserId(), date, "晚餐").compareTo(0l) > 0)){
-                overMinutes = new BigDecimal(overMinutes).subtract(new BigDecimal(ParamUtils.getShortBreakDeductionMinutes())).longValue();
+                overMinutes = new BigDecimal(overMinutes).subtract(new BigDecimal(ParamUtils.getShortBreakDeductionMinutes("TS"))).longValue();
             }
             BigDecimal workHours = new BigDecimal(0);
             if(overMinutes >= (maxHour*60)){
diff --git a/evo-admin/src/main/java/com/evo/common/utils/ParamUtils.java b/evo-admin/src/main/java/com/evo/common/utils/ParamUtils.java
index 210844a..b0d1f23 100644
--- a/evo-admin/src/main/java/com/evo/common/utils/ParamUtils.java
+++ b/evo-admin/src/main/java/com/evo/common/utils/ParamUtils.java
@@ -112,9 +112,11 @@ public class ParamUtils {
      * 获取日薪全勤天数
      * @return
      */
-    public static String getShortBreakDeductionMinutes(){
-        RzSysParam param= paramService.getRzSysParam("短休的工时扣减(分钟)", "short_break_deduction_minutes","30","短休的工时扣减(分钟)");
-        return param.getParamValue();
+    public static String getShortBreakDeductionMinutes(String type){
+        RzSysParam param= paramService.getRzSysParam("短休的工时扣减(分钟)", "short_break_deduction_minutes","{\"TS\":\"30\",\"ZC\":\"0\"}","短休的工时扣减(分钟)");
+        JSONObject jsonObject = JSONObject.parseObject(param.getParamValue());
+        String rulesVal = jsonObject.getString(type);
+        return (StringUtils.isEmpty(rulesVal) ? "0" : rulesVal);
     }
 
 
diff --git a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java
index c1d494a..e3c9354 100644
--- a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java
+++ b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java
@@ -190,7 +190,7 @@ public class SysStaffServiceImpl extends ServiceImpl<SysStaffMapper, SysStaff> i
             dkj_list.add(com.evo.equipment.constant.Constants.EQ_DEVICE_PUBLIC_CODE);   //公共
             dkj_list.add(sysStaff.getTimeClock());
             //下发照片
-            //eqSnDetailService.sendPhoto(dkj_list, Collections.asList(Collections.asMap("userId", String.valueOf(sysStaff.getUserId()), "name", sysStaff.getName(), "photoUrl", ParamUtils.getGlobalStaticUrl()+upload.getFileName())));
+            eqSnDetailService.sendPhoto(dkj_list, Collections.asList(Collections.asMap("userId", String.valueOf(sysStaff.getUserId()), "name", sysStaff.getName(), "photoUrl", ParamUtils.getGlobalStaticUrl()+upload.getFileName())));
         }
     }