integrated_traffic/src/main/java/com/zcloud/controller/system
zhangyanli a2b506427e Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev-new
# Conflicts:
#	src/main/java/com/zcloud/controller/archives/ArchivesCapitalController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesEduManagerController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesEduPlanController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesFilesController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesPostManController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesTeacherController.java
#	src/main/java/com/zcloud/controller/courseware/AppCoursewareController.java
#	src/main/java/com/zcloud/controller/courseware/DataCoursewareController.java
#	src/main/java/com/zcloud/controller/courseware/QuestionController.java
#	src/main/java/com/zcloud/controller/courseware/VideoCoursewareController.java
#	src/main/java/com/zcloud/controller/curriculum/AppMyCurriculumController.java
#	src/main/java/com/zcloud/controller/curriculum/CurriculumController.java
#	src/main/java/com/zcloud/controller/curriculum/KcmiddlekjController.java
#	src/main/java/com/zcloud/controller/eduArchives/ArchivesPdfFileController.java
#	src/main/java/com/zcloud/controller/education/PersonObtainEvidenceController.java
#	src/main/java/com/zcloud/controller/education/TrainingInfoController.java
#	src/main/java/com/zcloud/controller/education/TrainingPlanController.java
#	src/main/java/com/zcloud/controller/paper/StageexampaperInputController.java
#	src/main/java/com/zcloud/controller/platformCourseware/PlatformDataCoursewareController.java
#	src/main/java/com/zcloud/controller/platformCourseware/PlatformQuestionController.java
#	src/main/java/com/zcloud/controller/platformCourseware/PlatformVideoCoursewareController.java
#	src/main/java/com/zcloud/controller/platformCurriculum/PlatformCurriculumController.java
#	src/main/java/com/zcloud/controller/platformPaper/PlatformStageexampaperInputController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveyController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveyanswerController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveycorpinfoController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveyquestionController.java
#	src/main/java/com/zcloud/controller/study/AppMfolderStipulateController.java
#	src/main/java/com/zcloud/controller/study/MfolderStipulateController.java
#	src/main/java/com/zcloud/controller/study/StudySectionController.java
#	src/main/java/com/zcloud/controller/study/TempStudyController.java
#	src/main/java/com/zcloud/controller/study/VideoController.java
#	src/main/java/com/zcloud/controller/system/AppFeedbackController.java
#	src/main/java/com/zcloud/controller/task/AppCourseExamController.java
#	src/main/java/com/zcloud/controller/task/AppCourseStudentRelationController.java
#	src/main/java/com/zcloud/controller/task/AppCourseStudyController.java
#	src/main/java/com/zcloud/controller/task/AppCourseStudyVideoRecordController.java
#	src/main/java/com/zcloud/controller/task/AppCoursepapersController.java
#	src/main/java/com/zcloud/controller/task/AppStageExamController.java
#	src/main/java/com/zcloud/controller/task/AppStageStudentRelationController.java
#	src/main/java/com/zcloud/controller/task/AppStageexampaperController.java
#	src/main/java/com/zcloud/controller/task/AppStudyTaskController.java
#	src/main/java/com/zcloud/controller/task/CourseStudyVideoRecordController.java
#	src/main/java/com/zcloud/controller/task/StageExamController.java
#	src/main/java/com/zcloud/controller/task/StageStudentRelationController.java
#	src/main/java/com/zcloud/controller/task/StageexampaperController.java
#	src/main/java/com/zcloud/controller/task/StudyTaskController.java
#	src/main/java/com/zcloud/controller/video/AIWarningController.java
#	src/main/java/com/zcloud/controller/video/AppAudioOrVideoController.java
#	src/main/java/com/zcloud/controller/video/AppVideoManagerController.java
#	src/main/java/com/zcloud/controller/video/VideoManagerController.java
#	src/main/java/com/zcloud/mapper/datasource/corp/CorpInfoMapper.java
#	src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
#	src/main/java/com/zcloud/mapper/datasource/video/AIWarningMapper.java
#	src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java
#	src/main/java/com/zcloud/service/corp/CorpInfoService.java
#	src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java
#	src/main/java/com/zcloud/service/system/DepartmentService.java
#	src/main/java/com/zcloud/service/system/UsersService.java
#	src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
#	src/main/java/com/zcloud/service/video/AIWarningService.java
#	src/main/java/com/zcloud/service/video/VideoManagerService.java
#	src/main/java/com/zcloud/service/video/impl/AIWarningServiceImpl.java
#	src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java
#	src/main/java/com/zcloud/util/Const.java
#	src/main/java/com/zcloud/util/DateUtil.java
#	src/main/java/com/zcloud/util/InitPageDataUtil.java
#	src/main/resources/application.properties
#	src/main/resources/mybatis/datasource/system/UsersMapper.xml
2024-03-06 16:33:30 +08:00
..
AppDictionariesController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
AppFeedbackController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
AppImgFilesController.java 修复bug 2024-02-23 18:04:02 +08:00
AppMainController.java 整合home 2024-01-03 09:48:43 +08:00
AppScheduleController.java 整合prevention 2024-01-04 09:07:20 +08:00
AppSystemController.java 整合home 2024-01-03 09:48:43 +08:00
AppUsersController.java 提交信息 2024-03-06 16:25:53 +08:00
AppVersionManagerController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
ButtonrightsController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
DepartmentController.java 部门 单位对接 2024-02-26 17:46:09 +08:00
DictionariesController.java 运营车辆 2024-03-06 09:41:06 +08:00
DictionariesCorpController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
FHlogController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
FhbuttonController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
FhsmsController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
HeadController.java ai报警,人员信息导入的时候卡号变成5位 2024-01-26 15:54:26 +08:00
ImgFilesController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
LoginController.java Merge pull request 'dev' (#5) from integrated_whb/integrated_whb:dev into dev 2024-03-04 11:07:07 +08:00
MainController.java 隐患排查异常修改 2024-02-19 08:58:17 +08:00
MenuController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
PhotoController.java 整合system 2024-01-03 11:04:18 +08:00
PostController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
RoleController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
RouteController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
ScheduleController.java 整合prevention 2024-01-04 09:07:20 +08:00
SupervisionDepartmentController.java 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
UeditorController.java 整合home 2024-01-03 09:48:43 +08:00
UsersController.java 八项作业与部分bug 2024-03-01 09:05:45 +08:00