Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

# Conflicts:
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/TimeCalculationMapper.java

@@ -18,7 +18,7 @@ import java.util.Map;
  * @since 2020-01-09
  */
 public interface TimeCalculationMapper extends BaseMapper<TimeCalculation> {
-    Map<String, Object> getDevianceList(Page page,
+    List<Map<String, Object>> getDevianceList(Page page,
                                                @Param("userId") String userId,
                                                @Param("actionCode") Integer actionCode,
                                                @Param("date") String date,