Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TimeAutoExcludeController.java

@@ -108,7 +108,7 @@ public class TimeAutoExcludeController {
         }
         //新增
         //如果某部门曾设置过重叠的时间段，不予添加
-        List<TimeAutoExclude> times = timeAutoExcludeMapper.selectList(new QueryWrapper<TimeAutoExclude>().in("d_id", item.getDepartmentId()).ne("id",item.getId()));
+        List<TimeAutoExclude> times = timeAutoExcludeMapper.selectList(new QueryWrapper<TimeAutoExclude>().in("d_id", item.getDepartmentId()));
         for (TimeAutoExclude t : times) {
             Boolean b = timeAutoExcludeService.timeCheck(start1, t.getStartTime(), end1, t.getEndTime());
             if (b) {

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -456,7 +456,7 @@
                         <span>{{scope.row.startTime + '-' + scope.row.endTime}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="部门">
+                <el-table-column label="有效范围">
                     <template slot-scope="scope">
                         <div v-if="scope.row.dname==null">
                             <div>全公司</div>