<<<<<<< Updated upstream D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\vos\deptassess\DeptAssessVO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\service\deptassess\impl\DeptAssessServiceImpl.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\vos\deptassesschangescore\DeptAssessChangeScoreVO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\service\deptinspector\impl\DeptInspectorServiceImpl.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\dao\deptassesschangescore\IDeptAssessChangeScoreDao.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\deptinspector\DeptInspectorDTO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\deptassesschangescore\DeptAssessChangeScoreDTO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\grid\GridPointDTO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\partyorganize\PartyOrganizeDTO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\deptassess\DeptAssessDTO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\deptinspector\DeptInspectorController.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\utils\DateRange.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\config\properties\ScoreProperties.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\service\deptassess\IDeptAssessService.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\config\AuthClientSecurityConfig.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\grid\GridDTO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\service\deptassesschangescore\impl\DeptAssessChangeScoreServiceImpl.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\dao\deptinspector\IDeptInspectorDao.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\BigdataApplication.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\utils\DateUtils.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\deptassess\DeptAssessAllQuarterDTO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\serviceCity\ServiceCityController.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\config\properties\PartyBuildingProperties.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\partyOrganize\PartyOrganizeController.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\partyorganize\ResultPartyOrganize.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\service\deptassesschangescore\IDeptAssessChangeScoreService.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\service\deptinspector\IDeptInspectorService.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\deptassesschangescore\DeptAssessChangeScoreController.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\vos\deptinspector\DeptInspectorVO.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\deptassess\DeptAssessController.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\dao\deptassess\IDeptAssessDao.java D:\CF_work\ideaWorkSpace\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\grid\GridRelationDTO.java ======= E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\dao\casesupervise\ICaseSuperviseDao.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\areascoreaddminus\AreaScoreAddMinusDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\dao\scoredetail\IScoreDetailDao.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\service\configforscore\impl\ConfigForScoreServiceImpl.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\partymeetingscore\PartyMeetingScoreDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\worknote\WorkNoteForScoreDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\ztree\DictDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\grid\GridRelationDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\scoredetail\ScoreDetailController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\vos\configforscore\ConfigForScoreVO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\bossscore\BossScoreController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\service\casesupervise\ICaseSuperviseService.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\dao\areascoreaddminus\IAreaScoreAddMinusDao.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\config\properties\PartyBuildingProperties.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\app\apis\casesupervise\CaseSuperviseAppController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\service\areascoreaddminus\impl\AreaScoreAddMinusServiceImpl.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\resources\casesupervise\CaseSuperviseResourceController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\configforscore\ConfigForScoreController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\partymeetingscore\MeetingDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\serviceCity\ServiceCityController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\app\apis\scoredetail\ScoreDetailAppController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\service\areascoreaddminus\IAreaScoreAddMinusService.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\utils\DateUtils.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\partyscore\PartyScoreController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\resources\scoredetail\ScoreDetailResourceController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\utils\DateRange.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\BigdataApplication.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\partyOrganize\PartyOrganizeController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\service\casesupervise\impl\CaseSuperviseServiceImpl.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\casesupervise\CaseSuperviseController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\vos\areascoreaddminus\AreaScoreAddMinusVO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\resources\configforscore\ConfigForScoreResourceController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\service\scoredetail\impl\ScoreDetailServiceImpl.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\partyorganize\ResultPartyOrganize.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\casescore\CaseScoreController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\configforscore\ConfigForScoreDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\apis\areascoreaddminus\AreaScoreAddMinusController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\grid\GridDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\partyorganize\PartyOrganizeDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\app\apis\configforscore\ConfigForScoreAppController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\app\apis\areascoreaddminus\AreaScoreAddMinusAppController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\service\configforscore\IConfigForScoreService.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\casescore\CaseScoreDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\config\properties\ScoreProperties.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\vos\scoredetail\ScoreDetailVO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\config\AuthClientSecurityConfig.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\partyscore\PartyScoreDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\service\scoredetail\IScoreDetailService.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\scoredetail\ScoreDetailDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\dao\configforscore\IConfigForScoreDao.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\controller\resources\areascoreaddminus\AreaScoreAddMinusResourceController.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\vos\casesupervise\CaseSuperviseVO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\boss\BossDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\casesupervise\CaseSuperviseDTO.java E:\workspace-nice\system-bigdata\src\main\java\com\cm\bigdata\pojo\dtos\grid\GridPointDTO.java >>>>>>> Stashed changes