java/NTTravel.git

parent: 503bc89c | 补丁 | 提交 | ignore whitespace

luodangjia

2024-05-27 03565e00f7be08f2f6ace868298d70faf0930b91

5.27

20个文件已修改

2个文件已删除

4个文件已添加

	DriverNTTravel/.idea/workspace.xml	702 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java	64 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineSiteMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPhoneService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverNTTravel/guns-admin/src/main/resources/application.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementNTTravel/.idea/inspectionProfiles/Project_Default.xml	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementNTTravel/guns-admin/guns-admin.iml	224 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementNTTravel/guns-admin/src/main/resources/application.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementNTTravel/guns-core/guns-core.iml	101 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementNTTravel/guns-generator/guns-generator.iml	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementNTTravel/guns-parent.iml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementNTTravel/guns-rest/guns-rest.iml	97 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserNTTravel/.idea/shelf/_2024_5_16_9_49___Default_Changelist_.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserNTTravel/.idea/shelf/在进行更新之前于_2024_5_16_9_49_取消提交了更改_[Default_Changelist]/shelved.patch	12077 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserNTTravel/.idea/workspace.xml	728 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysReformistMapper.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysReformistMapper.xml	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java	102 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DriverNTTravel/.idea/workspace.xml

@@ -5,683 +5,32 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="a7570672-bfad-4d39-9825-905c049a9d7e" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/.gitattributes" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/.gitignore" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/LICENSE" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/README.md" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/doc/Guns 技术文档 v1.0.pdf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/sql/guns.sql" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/EhCacheConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SwaggerConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/MultiDataSourceConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/SingleDataSourceConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/properties/BeetlProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/BeetlConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/PermissionAop.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/BeetlConfiguration.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/ShiroExt.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/BussinessLog.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/Permission.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/Const.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/DatasourceEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/JwtConstants.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/Cache.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/CacheKey.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeleteDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeptDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DictMap.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/LogDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/MenuDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/NoticeMap.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/RoleDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/UserDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/AbstractDictMap.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/SystemDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/factory/DictFieldWarpperFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/ConstantFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/IConstantFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/MutiStrFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/PageFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/BizLogType.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ExpenseState.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogSucceed.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogType.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ManagerStatus.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuOpenStatus.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuStatus.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/Order.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/BizExceptionEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/InvalidKaptchaException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/GunsUserFilter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/RestApiInteceptor.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionHolderInterceptor.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/listener/ConfigListener.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogManager.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogObjectHolder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroDbRealm.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroUser.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/ICheck.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckManager.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/IShiro.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/ShiroFactroy.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/tag/DictSelectorTag.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ApiMenuFilter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/Contrast.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/JwtTokenUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/KaptchaUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DispatchController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/LineController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/LineSiteController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ReassignController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SiteController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/VersionManagementController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/controller/CodeController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/service/TableService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/AuthIntercepter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/AuthService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/AuthenticationKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/Configuration.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/HMACSHA1.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/HashKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/UrlEncoderUtils.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/BlackboardController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DeptController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/KaptchaController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/NoticeController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarModelMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DictMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DispatchMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverServiceMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ExpenseMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/GDInterfaceMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LinePriceMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineShiftDriverMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineShiftMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineSiteMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LocationMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MenuMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/NoticeMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OperationLogMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCancelMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCrossCityMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderPositionMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderPrivateCarMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PaymentRecordMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ReassignMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RegionMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RelationMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SiteMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemNoticeMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TransactionDetailsMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserInfoMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/VersionManagementMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DispatchMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ExpenseMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/GDInterfaceMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LinePriceMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineSiteMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LocationMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LoginLogMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/NoticeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OperationLogMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCrossCityMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderPositionMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderPrivateCarMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderTaxiMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PaymentRecordMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RegionMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RelationMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SiteMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemNoticeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TransactionDetailsMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/VersionManagementMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/factory/UserFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Car.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarModel.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dept.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dispatch.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Expense.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/GDInterface.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Line.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LinePrice.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineShift.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineShiftDriver.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineSite.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Location.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LoginLog.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Menu.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Notice.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OperationLog.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCrossCity.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPrivateCar.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderTaxi.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PaymentRecord.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Region.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Relation.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Site.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemNotice.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TransactionDetails.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/VersionManagement.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDeptService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDictService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDispatchService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IGDInterfaceService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILineService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILineShiftService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILineSiteService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMenuService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/INoticeService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOperationLogService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCancelService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCrossCityService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderPositionService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderPrivateCarService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderTaxiService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPaymentRecordService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRelationService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISiteService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemNoticeService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITransactionDetailsService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IVersionManagementService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DispatchServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/GDInterfaceServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LineServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LineShiftServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LineSiteServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPrivateCarServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTaxiServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PaymentRecordServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SiteServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TransactionDetailsServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/VersionManagementServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ManagerUser.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqAddManager.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqEditManager.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/UserDto.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiApiUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HttpClientUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ICBCPayUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JGPushUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JuHeUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MD5AndKL.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SystemException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/UUIDUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CarInfoWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CarListWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DeptWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DictWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LineShiftWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LineSiteWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LocationWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LogWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LoginWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MenuWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/NoticeWrapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderCrossCityWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ReassignInfoWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ReassignListWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RoleWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RosterWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/SiteWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/VersionManagementWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/META-INF/spring-devtools.properties" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/ehcache.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/logback-spring.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/code/code.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/_fstyle.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/bootstrap-rtl.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/bootstrap.min.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/font-awesome.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/font-awesome.min.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/login.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/patterns/shattered.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/bootstrap-table/bootstrap-table.min.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/custom.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/validate/bootstrapValidator.min.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/webuploader/webuploader.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/demo.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/zTreeStyle.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/style.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/favicon.ico" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.svg" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.svg" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/bg.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/boy.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/girl.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/icons.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/loading-upload.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/locked.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/user.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/bootstrap.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/DateUtils.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/Feng.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/ajax-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/bootstrap-table-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/select-list-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/tree-table-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/web-upload-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/ztree-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/contabs.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/content.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/hplus.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/jquery.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/jquery.min.map" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/chosen/chosen.jquery.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/iCheck/icheck.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/laydate.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.svg" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/laydate.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/layer.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/layer.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/need/layer.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/layer.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/metisMenu/jquery.metisMenu.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/pace/pace.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/slimscroll/jquery.slimscroll.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/validate/additional-methods.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/validate/bootstrapValidator.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/validate/zh_CN.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/wangEditor/wangEditor.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/Uploader.swf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.custom.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.custom.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.fis.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.flashonly.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.flashonly.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.html5only.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.html5only.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.noimage.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.noimage.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.nolog.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.nolog.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.withoutimage.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.withoutimage.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/ztree/jquery.ztree.all.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/code/gen.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/flowable/expense/expense.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/flowable/expense/expense_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/flowable/process/process.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/flowable/process/process_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/code/code.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/dept/dept.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/dept/dept_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/dict/dict.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/dict/dict_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/log/log.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/log/login_log.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/menu/menu.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/menu/menu_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/notice/notice.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/notice/notice_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/role/role.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/role/role_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/user/user.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/user/user_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/CoreFlag.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/aop/BaseControllerExceptionHandler.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/controller/BaseController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/controller/GlobalController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/controller/GunsErrorView.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/ErrorTip.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/SuccessTip.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/Tip.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/warpper/BaseControllerWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/BaseCacheFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/CacheKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/EhcacheFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/ICache.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/ILoader.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultFastjsonConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultMultiConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultWebConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/MutiDataSourceProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/constant/IsMenu.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/datascope/DataScope.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/datascope/DataScopeInterceptor.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/db/Db.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsExceptionEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/exception/ServiceExceptionEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/DataSourceContextHolder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/DynamicDataSource.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/annotion/DataSource.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/aop/MultiSourceExAop.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/node/MenuNode.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/node/ZTreeNode.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/page/PageBT.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/page/PageInfoBT.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/qr/ImgQrTool.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/qr/MatrixToImageConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/qr/MatrixToImageWriter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/qr/QrImage.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/BasicType.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/BeanKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/ClassKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/CollectionKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/DateTime.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/DateTimeKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/HexKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/HttpKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/ObjectKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/PageKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/StrKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/WafKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/WafRequestWrapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/exception/ToolBoxException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/Convert.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/FileUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/HttpSessionHolder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/IdGenerator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/MD5Util.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/NumUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/PingYinUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/RenderUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/ResKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/SimpleContrast.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/SpringContextHolder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/SqlUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/ToolUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/xss/XssFilter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/xss/XssHttpServletRequestWrapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/resources/META-INF/spring.factories" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/resources/default-config.properties" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/GunsCodeGenerator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/AbstractGeneratorConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/GunsGeneratorConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/WebGeneratorConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/model/GenQo.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/SimpleTemplateEngine.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/base/AbstractTemplateEngine.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/base/GunsTemplateEngine.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/ContextConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/ControllerConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/DaoConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/Menu.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/PageConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/ServiceConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/SqlConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/Controller.java.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/menu_sql.sql.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page.html.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page.js.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page_add.html.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page_edit.html.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page_info.js.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/db/guns_rest.sql" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/GunsRestApplication.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/GunsRestServletInitializer.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/SimpleObject.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/aop/GlobalExceptionHandler.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/exception/BizExceptionEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/persistence/dao/UserMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/persistence/dao/mapping/UserMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/persistence/model/User.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/MessageConverConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/MybatisPlusConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/WebConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/properties/JwtProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/properties/RestProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/controller/AuthController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/controller/dto/AuthRequest.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/controller/dto/AuthResponse.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/converter/BaseTransferEntity.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/converter/WithSignMessageConverter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/filter/AuthFilter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/security/DataSecurityAction.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/security/impl/Base64SecurityAction.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/util/JwtTokenUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/validator/IReqValidator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/validator/dto/Credence.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/validator/impl/DbValidator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/validator/impl/SimpleValidator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/example/ExampleController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/resources/application.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTransferMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysFaceDistinguishMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysFaceDistinguishMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTransfer.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTransferService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysFaceDistinguishService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/CompareFace.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysReformistMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysReformistMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineSiteMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineSiteMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPhoneService.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPhoneService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/guns-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/guns-admin.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineSite.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineSite.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-core/guns-core.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-core/guns-core.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-generator/guns-generator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-generator/guns-generator.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-parent.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-parent.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-rest/guns-rest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-rest/guns-rest.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/.idea/shelf/_2024_5_16_9_49___Default_Changelist_.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/.idea/shelf/在进行更新之前于_2024_5_16_9_49_取消提交了更改_[Default_Changelist]/shelved.patch" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/controller/OrderCharteredCarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/controller/OrderCharteredCarController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/LineSite.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/LineSite.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCharteredService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCharteredService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1113,7 +462,7 @@
      </set>
    </option>
  </component>
  <component name="RunManager" selected="应用程序.CompareFace">
  <component name="RunManager" selected="Spring Boot.GunsApplication">
    <configuration name="CompareFace" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.stylefeng.guns.modular.system.util.CompareFace" />
      <module name="guns-admin" />
@@ -1228,6 +577,7 @@
      <workItem from="1716340088938" duration="1025000" />
      <workItem from="1716341934695" duration="13661000" />
      <workItem from="1716427926409" duration="9187000" />
      <workItem from="1716514334090" duration="9851000" />
    </task>
    <servers />
  </component>
@@ -1327,6 +677,30 @@
          <line>96</line>
          <option name="timeStamp" value="20" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java</url>
          <line>56</line>
          <option name="timeStamp" value="21" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java</url>
          <line>748</line>
          <option name="timeStamp" value="22" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java</url>
          <line>50</line>
          <option name="timeStamp" value="23" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-method">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java</url>
          <line>115</line>
          <properties class="com.stylefeng.guns.modular.system.service.IOrderService" method="process">
            <option name="EMULATED" value="true" />
            <option name="WATCH_EXIT" value="false" />
          </properties>
          <option name="timeStamp" value="25" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
  </component>

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.api;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
@@ -8,15 +9,13 @@
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.dao.SysReformistMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.util.ALiSendSms;
//import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
import com.stylefeng.guns.modular.system.util.CompareFace;
import com.stylefeng.guns.modular.system.util.HuaWeiSMSUtil;
import com.stylefeng.guns.modular.system.warpper.ActivityWarpper;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.*;
@@ -76,7 +75,8 @@
    @Autowired
    private IOrderLogisticsService orderLogisticsService;


    @Autowired
    private SysReformistMapper sysReformistMapper;

    /**
     * 获取短信验证码
@@ -333,7 +333,7 @@
    }

    @ResponseBody
    @PostMapping("/base/driver/face")
    @PostMapping("/api/driver/face")
    @ApiOperation(value = "面容识别", tags = {"司机端-登录"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@@ -750,7 +750,14 @@
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            Map<String, Object> map = driverService.queryPhone(uid);
            String wechat = "";
            Driver driver = driverService.selectById(uid);
            List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", driver.getCompanyId()));
            for (SysReformist sysReformist : companyId) {
                wechat = sysReformist.getDriverQrCode();
            }

            Map<String, Object> map = driverService.queryPhone(uid,wechat);
            return ResultUtil.success(map);
        }catch (Exception e){
            e.printStackTrace();

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java

@@ -1,6 +1,9 @@
package com.stylefeng.guns.modular.api;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.netflix.ribbon.proxy.annotation.Http;
import com.stylefeng.guns.modular.system.dao.SysReformistMapper;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.DriverService;
import com.stylefeng.guns.modular.system.model.Phone;
import com.stylefeng.guns.modular.system.model.SysReformist;
@@ -35,7 +38,7 @@
    @Autowired
    private IDriverService driverService;
    @Autowired
    private SysReformist
    private SysReformistMapper sysReformistMapper;


    /**
@@ -49,9 +52,20 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "当前定位行政区域编号", name = "code", required = true, dataType = "string"),
    })
    public ResultUtil queryCustomerPhone(String code){
    public ResultUtil queryCustomerPhone(String code,HttpServletRequest request){
        try {
            Map<String, Object> map = phoneService.queryCustomerPhone(code);
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            String wechat = "";
            Driver driver = driverService.selectById(uid);
            List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", driver.getCompanyId()));
            for (SysReformist sysReformist : companyId) {
                wechat = sysReformist.getDriverQrCode();
            }

            Map<String, Object> map = phoneService.queryCustomerPhone(code,wechat);
            return ResultUtil.success(map);
        }catch (Exception e){
            e.printStackTrace();
@@ -59,24 +73,28 @@
        }
    }

    @ResponseBody
    @PostMapping("/queryWechatPic")
    @ApiOperation(value = "获取客服二维码", tags = {"司机端-首页"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "当前定位行政区域编号", name = "code", required = true, dataType = "string"),
    })
    public ResultUtil queryCustomerWechat(String code, HttpServletRequest request){
        try {
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }

            return
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }

    }
//    @ResponseBody
//    @PostMapping("/queryWechatPic")
//    @ApiOperation(value = "获取客服二维码", tags = {"司机端-首页"})
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
//    })
//    public ResultUtil queryCustomerWechat(HttpServletRequest request){
//        try {
//            Integer uid = driverService.getUserIdFormRedis(request);
//            if(null == uid){
//                return ResultUtil.tokenErr();
//            }
//            Driver driver = driverService.selectById(uid);
//            List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", driver.getCompanyId()));
//            for (SysReformist sysReformist : companyId) {
//                return ResultUtil.success(sysReformist.getDriverQrCode());
//            }
//
//        }catch (Exception e){
//            e.printStackTrace();
//            return ResultUtil.runErr();
//        }
//        return ResultUtil.error("请稍后重试");
//    }
}

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineSiteMapper.xml

@@ -18,7 +18,7 @@
        select
        b.id as id,
        a.id as lineShiftDriverId,
        b.startTime as startTime,
        CONCAT(b.startTime,"-",b.endTime) as startTime,
        c.headImgUrl as headImgUrl,
        CONCAT(left(c.`name`, 1), '师傅') as `name`,
        d.carLicensePlate as carLicensePlate,

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java

@@ -137,11 +137,17 @@
                    map.put("price", jsonObject.getString("num1"));
                    data = map;
                    list.add(data);
                    if (lineShift.getStartTime().equals(lineShift.getEndTime())){
                        data.put("startTime",lineShift.getStartTime());
                    }
                }
            }
            if(b){
                data.put("id", lineShift.getId());
                data.put("startTime", lineShift.getStartTime());
                data.put("startTime", lineShift.getStartTime()+"-"+lineShift.getEndTime());
                if (lineShift.getStartTime().equals(lineShift.getEndTime())){
                    data.put("startTime",lineShift.getStartTime());
                }
                list.add(data);
            }
        }

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java

@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;

/**
 * 订单改派金额设置
 */
@TableName("t_sys_reformist")
@Data
public class SysReformist {
    /**
     * 主键
@@ -38,6 +40,14 @@
     */
    @TableField("isTaxiCar")
    private Integer isTaxiCar;
    /**
     * 用户端客服二维码
     */
    private String userQrCode;
    /**
     * 司机端客服二维码
     */
    private String driverQrCode;

    public Integer getId() {
        return id;

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java

@@ -209,7 +209,7 @@
     * @return
     * @throws Exception
     */
    Map<String, Object> queryPhone(Integer uid) throws Exception;
    Map<String, Object> queryPhone(Integer uid,String wechat) throws Exception;


    /**

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPhoneService.java

@@ -22,5 +22,5 @@
     * @return
     * @throws Exception
     */
    Map<String, Object> queryCustomerPhone(String code) throws Exception;
    Map<String, Object> queryCustomerPhone(String code,String wechat) throws Exception;
}

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -839,11 +839,12 @@
     * @throws Exception
     */
    @Override
    public Map<String, Object> queryPhone(Integer uid) throws Exception {
    public Map<String, Object> queryPhone(Integer uid,String wechat) throws Exception {
        Driver driver = this.selectById(uid);
        Company company = companyMapper.selectById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
                driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
        Map<String, Object> map = new HashMap<>();
        map.put("wechatUrl",wechat);
        if(company.getType() == 3){//加盟商
            Phone phone = phoneMapper.queryInfo(company.getId(), 2);
            map.put("franchisee", null != phone ? phone.getPhone() : "");
@@ -861,6 +862,7 @@
            }else{
                map.put("platform", "");
            }

            return map;
        }
        if(company.getType() == 2){//分公司

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java

@@ -46,7 +46,7 @@
     * @throws Exception
     */
    @Override
    public Map<String, Object> queryCustomerPhone(String code) throws Exception {
    public Map<String, Object> queryCustomerPhone(String code,String wechat) throws Exception {
        String province = code.substring(0, 2) + "0000";
        String city = code.substring(0, 4) + "00";

@@ -74,6 +74,8 @@
            query = phoneMapper.query(3, null, province, null, null);
        }
        map.put("scheduling", null != query ? query.getPhone() : "");

        map.put("wechatUrl",wechat);
        return map;
    }
}

 DriverNTTravel/guns-admin/src/main/resources/application.yml

@@ -13,7 +13,7 @@
  application:
    name: driver-server
  profiles:
    active: produce
    active: dev
  mvc:
    static-path-pattern: /static/**
    view:

 ManagementNTTravel/.idea/inspectionProfiles/Project_Default.xml

New file
@@ -0,0 +1,14 @@
<component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="AliAccessStaticViaInstance" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AliArrayNamingShouldHaveBracket" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AliControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AliDeprecation" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AliEqualsAvoidNull" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AliLongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AliMissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AliWrapperTypeEquality" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="MapOrSetKeyShouldOverrideHashCodeEquals" enabled="true" level="WARNING" enabled_by_default="true" />
  </profile>
</component>

 ManagementNTTravel/guns-admin/guns-admin.iml

@@ -1,230 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module version="4">
  <component name="FacetManager">
    <facet type="web" name="Web">
      <configuration>
        <descriptors>
          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
        </descriptors>
        <webroots>
          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
        </webroots>
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-resource" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="guns-core (2)" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatisplus-spring-boot-starter:1.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-support:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.11" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
    <orderEntry type="module" module-name="guns-generator (2)" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.32" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:4.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.20" level="project" />
    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.68" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.68" level="project" />
    <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:2.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.woodstox:woodstox-core:5.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:4.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-all:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.13" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.13" level="project" />
    <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
    <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-extension:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gui-util:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-rasterizer-ext:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-rasterizer:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-slideshow:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-squiggle-ext:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-squiggle:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svgbrowser:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svgpp:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svgrasterizer:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-swing:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ttf2svg:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.13" level="project" />
    <orderEntry type="library" name="Maven: de.rototor.pdfbox:graphics2d:0.30" level="project" />
    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.22" level="project" />
    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.22" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.3.1" level="project" />
    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.17" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.23.Final" level="project" />
    <orderEntry type="library" name="Maven: cn.jpush.api:jiguang-common:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: com.ibeetl:beetl:2.8.5" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.2" level="project" />
    <orderEntry type="library" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:antlr4-annotations:4.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:2.5.0" level="project" />
    <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
    <orderEntry type="library" name="Maven: cn.rongcloud.im:server-sdk-java:3.0.4" level="project" />
    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
    <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.8.10.ALL" level="project" />
    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
  </component>
</module>

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java

@@ -12,7 +12,6 @@
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.sun.org.apache.regexp.internal.RE;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;

 ManagementNTTravel/guns-admin/src/main/resources/application.yml

@@ -57,7 +57,7 @@

spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    url: jdbc:mysql://192.168.110.34:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: 123456
    db-name: guns #用来搜集数据库的所有表

 ManagementNTTravel/guns-core/guns-core.iml

@@ -1,107 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module version="4">
  <component name="FacetManager">
    <facet type="web" name="Web">
      <configuration>
        <webroots />
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatisplus-spring-boot-starter:1.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-support:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.11" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.5" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.5" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.32" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-web:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-webmvc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.zxing:core:3.2.1" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ehcache:ehcache:3.3.1" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-context-support:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-examples:3.9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-excelant:3.9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.9" level="project" />
    <orderEntry type="library" name="Maven: com.huaweicloud:esdk-obs-java:3.19.5" level="project" />
    <orderEntry type="library" name="Maven: com.jamesmurty.utils:java-xmlbuilder:1.1" level="project" />
    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
  </component>
</module>

 ManagementNTTravel/guns-generator/guns-generator.iml

@@ -1,63 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="guns-core (2)" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatisplus-spring-boot-starter:1.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.11" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
    <orderEntry type="library" name="Maven: com.ibeetl:beetl:2.8.5" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.2" level="project" />
    <orderEntry type="library" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:antlr4-annotations:4.2" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-support:2.3" level="project" />
  </component>
</module>

 ManagementNTTravel/guns-parent.iml

@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
  <component name="AdditionalModuleElements">
    <content url="file://$MODULE_DIR$" dumb="true">
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
</module>

 ManagementNTTravel/guns-rest/guns-rest.iml

@@ -1,103 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module version="4">
  <component name="FacetManager">
    <facet type="web" name="Web">
      <configuration>
        <webroots />
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.32" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
    <orderEntry type="module" module-name="guns-core (2)" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatisplus-spring-boot-starter:1.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-support:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.11" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
  </component>
</module>

 UserNTTravel/.idea/shelf/_2024_5_16_9_49___Default_Changelist_.xml

File was deleted

 UserNTTravel/.idea/shelf/在进行更新之前于_2024_5_16_9_49_取消提交了更改_[Default_Changelist]/shelved.patch

File was deleted

 UserNTTravel/.idea/workspace.xml

@@ -5,683 +5,32 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="202e88b5-454e-4bc8-8ff5-2d4680354082" name="Default Changelist" comment="Default Changelist">
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/.gitattributes" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/.gitignore" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/LICENSE" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/README.md" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/doc/Guns 技术文档 v1.0.pdf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/sql/guns.sql" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/EhCacheConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SwaggerConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/MultiDataSourceConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/SingleDataSourceConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/properties/BeetlProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/BeetlConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/PermissionAop.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/BeetlConfiguration.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/ShiroExt.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/BussinessLog.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/Permission.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/Const.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/DatasourceEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/JwtConstants.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/Cache.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/CacheKey.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeleteDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeptDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DictMap.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/LogDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/MenuDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/NoticeMap.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/RoleDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/UserDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/AbstractDictMap.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/SystemDict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/factory/DictFieldWarpperFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/ConstantFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/IConstantFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/MutiStrFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/PageFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/BizLogType.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ExpenseState.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogSucceed.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogType.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ManagerStatus.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuOpenStatus.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuStatus.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/Order.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/BizExceptionEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/InvalidKaptchaException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/GunsUserFilter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/RestApiInteceptor.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionHolderInterceptor.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/listener/ConfigListener.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogManager.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogObjectHolder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroDbRealm.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroUser.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/ICheck.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckManager.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/IShiro.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/ShiroFactroy.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/tag/DictSelectorTag.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ApiMenuFilter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/Contrast.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/JwtTokenUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/KaptchaUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DispatchController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/LineController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/LineSiteController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ReassignController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SiteController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/VersionManagementController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/controller/CodeController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/service/TableService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/AuthIntercepter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/AuthService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/AuthenticationKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/Configuration.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/HMACSHA1.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/HashKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/auth/UrlEncoderUtils.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/BlackboardController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DeptController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/KaptchaController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/NoticeController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarModelMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DictMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DispatchMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverServiceMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ExpenseMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/GDInterfaceMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LinePriceMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineShiftDriverMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineShiftMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineSiteMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LocationMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MenuMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/NoticeMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OperationLogMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCancelMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCrossCityMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderPositionMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderPrivateCarMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PaymentRecordMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ReassignMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RegionMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RelationMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SiteMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemNoticeMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TransactionDetailsMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserInfoMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/VersionManagementMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DispatchMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ExpenseMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/GDInterfaceMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LinePriceMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineSiteMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LocationMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LoginLogMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/NoticeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OperationLogMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCrossCityMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderPositionMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderPrivateCarMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderTaxiMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PaymentRecordMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RegionMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RelationMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SiteMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemNoticeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TransactionDetailsMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/VersionManagementMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/factory/UserFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Car.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarModel.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dept.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dict.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dispatch.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Expense.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/GDInterface.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Line.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LinePrice.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineShift.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineShiftDriver.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineSite.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Location.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LoginLog.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Menu.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Notice.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OperationLog.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCrossCity.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPrivateCar.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderTaxi.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PaymentRecord.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Region.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Relation.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Site.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemNotice.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TransactionDetails.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/VersionManagement.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDeptService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDictService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDispatchService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IGDInterfaceService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILineService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILineShiftService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILineSiteService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMenuService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/INoticeService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOperationLogService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCancelService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCrossCityService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderPositionService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderPrivateCarService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderTaxiService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPaymentRecordService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRelationService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISiteService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemNoticeService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITransactionDetailsService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IVersionManagementService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DispatchServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/GDInterfaceServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LineServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LineShiftServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LineSiteServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPrivateCarServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTaxiServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PaymentRecordServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SiteServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TransactionDetailsServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/VersionManagementServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ManagerUser.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqAddManager.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqEditManager.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/UserDto.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiApiUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HttpClientUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ICBCPayUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JGPushUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JuHeUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MD5AndKL.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SystemException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/UUIDUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CarInfoWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CarListWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DeptWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DictWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LineShiftWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LineSiteWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LocationWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LogWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LoginWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MenuWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/NoticeWrapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderCrossCityWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ReassignInfoWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ReassignListWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RoleWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RosterWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/SiteWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/VersionManagementWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/META-INF/spring-devtools.properties" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/ehcache.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/logback-spring.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/code/code.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/_fstyle.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/bootstrap-rtl.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/bootstrap.min.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/font-awesome.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/font-awesome.min.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/login.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/patterns/shattered.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/bootstrap-table/bootstrap-table.min.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/custom.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/validate/bootstrapValidator.min.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/webuploader/webuploader.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/demo.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/zTreeStyle.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/css/style.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/favicon.ico" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.svg" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.svg" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/bg.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/boy.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/girl.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/icons.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/loading-upload.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/locked.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/img/user.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/bootstrap.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/DateUtils.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/Feng.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/ajax-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/bootstrap-table-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/select-list-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/tree-table-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/web-upload-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/common/ztree-object.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/contabs.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/content.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/hplus.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/jquery.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/jquery.min.map" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/chosen/chosen.jquery.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/iCheck/icheck.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/laydate.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.svg" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/laydate.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/layer.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/layer.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/need/layer.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/layer.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/metisMenu/jquery.metisMenu.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/pace/pace.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/slimscroll/jquery.slimscroll.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/validate/additional-methods.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/validate/bootstrapValidator.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/validate/zh_CN.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/wangEditor/wangEditor.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/Uploader.swf" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.css" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.custom.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.custom.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.fis.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.flashonly.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.flashonly.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.html5only.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.html5only.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.noimage.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.noimage.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.nolog.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.nolog.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.withoutimage.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.withoutimage.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/js/plugins/ztree/jquery.ztree.all.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/code/gen.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/flowable/expense/expense.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/flowable/expense/expense_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/flowable/process/process.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/flowable/process/process_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/code/code.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/dept/dept.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/dept/dept_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/dict/dict.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/dict/dict_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/log/log.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/log/login_log.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/menu/menu.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/menu/menu_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/notice/notice.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/notice/notice_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/role/role.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/role/role_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/user/user.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/webapp/static/modular/system/user/user_info.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/CoreFlag.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/aop/BaseControllerExceptionHandler.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/controller/BaseController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/controller/GlobalController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/controller/GunsErrorView.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/ErrorTip.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/SuccessTip.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/Tip.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/base/warpper/BaseControllerWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/BaseCacheFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/CacheKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/EhcacheFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/ICache.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/cache/ILoader.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultFastjsonConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultMultiConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultWebConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/MutiDataSourceProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/constant/IsMenu.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/datascope/DataScope.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/datascope/DataScopeInterceptor.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/db/Db.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsExceptionEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/exception/ServiceExceptionEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/DataSourceContextHolder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/DynamicDataSource.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/annotion/DataSource.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/aop/MultiSourceExAop.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/node/MenuNode.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/node/ZTreeNode.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/page/PageBT.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/page/PageInfoBT.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/qr/ImgQrTool.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/qr/MatrixToImageConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/qr/MatrixToImageWriter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/qr/QrImage.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/BasicType.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/BeanKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/ClassKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/CollectionKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/DateTime.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/DateTimeKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/HexKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/HttpKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/ObjectKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/PageKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/StrKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/WafKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/WafRequestWrapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/support/exception/ToolBoxException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/Convert.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/FileUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/HttpSessionHolder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/IdGenerator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/MD5Util.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/NumUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/PingYinUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/RenderUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/ResKit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/SimpleContrast.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/SpringContextHolder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/SqlUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/ToolUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/xss/XssFilter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/java/com/stylefeng/guns/core/xss/XssHttpServletRequestWrapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/resources/META-INF/spring.factories" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-core/src/main/resources/default-config.properties" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/GunsCodeGenerator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/AbstractGeneratorConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/GunsGeneratorConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/WebGeneratorConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/action/model/GenQo.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/SimpleTemplateEngine.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/base/AbstractTemplateEngine.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/base/GunsTemplateEngine.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/ContextConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/ControllerConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/DaoConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/Menu.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/PageConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/ServiceConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/SqlConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/Controller.java.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/menu_sql.sql.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page.html.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page.js.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page_add.html.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page_edit.html.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-generator/src/main/resources/gunsTemplate/advanced/page_info.js.btl" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/db/guns_rest.sql" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/GunsRestApplication.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/GunsRestServletInitializer.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/SimpleObject.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/aop/GlobalExceptionHandler.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/exception/BizExceptionEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/persistence/dao/UserMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/persistence/dao/mapping/UserMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/common/persistence/model/User.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/MessageConverConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/MybatisPlusConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/WebConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/properties/JwtProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/config/properties/RestProperties.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/controller/AuthController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/controller/dto/AuthRequest.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/controller/dto/AuthResponse.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/converter/BaseTransferEntity.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/converter/WithSignMessageConverter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/filter/AuthFilter.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/security/DataSecurityAction.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/security/impl/Base64SecurityAction.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/util/JwtTokenUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/validator/IReqValidator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/validator/dto/Credence.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/validator/impl/DbValidator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/validator/impl/SimpleValidator.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/example/ExampleController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-rest/src/main/resources/application.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/pom.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTransferMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysFaceDistinguishMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysFaceDistinguishMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTransfer.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTransferService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysFaceDistinguishService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/CompareFace.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysReformistMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysReformistMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineSiteMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineSiteMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPhoneService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPhoneService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/guns-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/guns-admin.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineSite.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineSite.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-core/guns-core.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-core/guns-core.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-generator/guns-generator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-generator/guns-generator.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-parent.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-parent.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-rest/guns-rest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-rest/guns-rest.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/shelf/_2024_5_16_9_49___Default_Changelist_.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2024_5_16_9_49_取消提交了更改_[Default_Changelist]/shelved.patch" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/controller/OrderCharteredCarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/controller/OrderCharteredCarController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/LineSite.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/LineSite.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCharteredService.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCharteredService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1015,41 +364,42 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;Maven.guns-admin [clean].executor&quot;: &quot;Run&quot;,
    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
    &quot;Spring Boot.GunsRestApplication.executor&quot;: &quot;Debug&quot;,
    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
    &quot;last_opened_file_path&quot;: &quot;D:/study/NTTravel/ManagementNTTravel&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;,
    &quot;应用程序.ALiSendSms.executor&quot;: &quot;Debug&quot;
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "Maven.guns-admin [clean].executor": "Run",
    "RequestMappingsPanelOrder0": "0",
    "RequestMappingsPanelOrder1": "1",
    "RequestMappingsPanelWidth0": "75",
    "RequestMappingsPanelWidth1": "75",
    "RunOnceActivity.OpenProjectViewOnStart": "true",
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
    "Spring Boot.GunsRestApplication.executor": "Debug",
    "git-widget-placeholder": "master",
    "kotlin-language-version-configured": "true",
    "last_opened_file_path": "D:/study/NTTravel/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping",
    "node.js.detected.package.eslint": "true",
    "node.js.detected.package.tslint": "true",
    "node.js.selected.package.eslint": "(autodetect)",
    "node.js.selected.package.tslint": "(autodetect)",
    "nodejs_package_manager_path": "npm",
    "vue.rearranger.settings.migration": "true",
    "应用程序.ALiSendSms.executor": "Debug"
  }
}</component>
}]]></component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
      <recent name="D:\study\NTTravel\UserNTTravel\guns-admin\src\main\java\com\stylefeng\guns\modular\system\dao\mapping" />
      <recent name="D:\study\NTTravel\UserNTTravel\guns-admin\src\main\java\com\stylefeng\guns\modular" />
      <recent name="D:\study\NTTravel\UserNTTravel\guns-admin\src\main\java\com\stylefeng\guns\modular\CharteredCar\dao\mapping" />
      <recent name="E:\IDEA Workspaces\KYTravel\UserOKTravel\guns-admin\src\test" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.stylefeng.guns.modular.system.dao" />
      <recent name="com.stylefeng.guns.modular.system.service" />
      <recent name="com.stylefeng.guns.modular.system.service.impl" />
      <recent name="com.stylefeng.guns.modular.system.model" />
      <recent name="com.stylefeng.guns.modular.CharteredCar.dao" />
      <recent name="com.stylefeng.guns.modular.system.util" />
    </key>
  </component>
  <component name="RunDashboard">
@@ -1187,6 +537,7 @@
      <workItem from="1716274389631" duration="2398000" />
      <workItem from="1716341948283" duration="8173000" />
      <workItem from="1716427936604" duration="9618000" />
      <workItem from="1716514345062" duration="5401000" />
    </task>
    <servers />
  </component>
@@ -1307,6 +658,11 @@
          <line>48</line>
          <option name="timeStamp" value="10" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java</url>
          <line>61</line>
          <option name="timeStamp" value="11" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
  </component>

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysReformistMapper.java

New file
@@ -0,0 +1,17 @@
package com.stylefeng.guns.modular.system.dao;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.SysReformist;
import org.apache.ibatis.annotations.Param;

public interface SysReformistMapper extends BaseMapper<SysReformist> {


    /**
     * 获取改派金额
     * @param companyId
     * @return
     * @throws Exception
     */
    Double queryMoney(@Param("companyId") Integer companyId) throws Exception;
}

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysReformistMapper.xml

New file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.modular.system.dao.SysReformistMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.SysReformist">
        <id column="id" property="id"/>
        <result column="companyId" property="companyId"/>
        <result column="money" property="money"/>
        <result column="isSpecialCar" property="isSpecialCar"/>
        <result column="isTaxiCar" property="isTaxiCar"/>
    </resultMap>



    <select id="queryMoney" resultType="double">
        select money from t_sys_reformist where companyId = #{companyId}
    </select>
</mapper>

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java

New file
@@ -0,0 +1,102 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;

/**
 * 订单改派金额设置
 */
@TableName("t_sys_reformist")
@Data
public class SysReformist {
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableField("id")
    private Integer id;
    /**
     * 企业id
     */
    @TableField("companyId")
    private Integer companyId;
    /**
     * 金额
     */
    @TableField("money")
    private Double money;
    /**
     * 专车是否允许改派（1=否，2=是）
     * @return
     */
    @TableField("isSpecialCar")
    private Integer isSpecialCar;
    /**
     * 出租车是否允许改派（1=否，2=是）
     * @return
     */
    @TableField("isTaxiCar")
    private Integer isTaxiCar;
    /**
     * 用户端客服二维码
     */
    private String userQrCode;
    /**
     * 司机端客服二维码
     */
    private String driverQrCode;

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getCompanyId() {
        return companyId;
    }

    public void setCompanyId(Integer companyId) {
        this.companyId = companyId;
    }

    public Double getMoney() {
        return money;
    }

    public void setMoney(Double money) {
        this.money = money;
    }

    public Integer getIsSpecialCar() {
        return isSpecialCar;
    }

    public void setIsSpecialCar(Integer isSpecialCar) {
        this.isSpecialCar = isSpecialCar;
    }

    public Integer getIsTaxiCar() {
        return isTaxiCar;
    }

    public void setIsTaxiCar(Integer isTaxiCar) {
        this.isTaxiCar = isTaxiCar;
    }

    @Override
    public String toString() {
        return "SysReformist{" +
                "id=" + id +
                ", companyId=" + companyId +
                ", money=" + money +
                ", isSpecialCar=" + isSpecialCar +
                ", isTaxiCar=" + isTaxiCar +
                '}';
    }
}

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java

@@ -1,10 +1,15 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.PhoneMapper;
import com.stylefeng.guns.modular.system.dao.SysReformistMapper;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.Phone;
import com.stylefeng.guns.modular.system.model.SysReformist;
import com.stylefeng.guns.modular.system.service.IPhoneService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -19,6 +24,8 @@

    @Resource
    private PhoneMapper phoneMapper;
    @Autowired
    private SysReformistMapper sysReformistMapper;

    /**
     * 获取所有系统电话
@@ -69,6 +76,17 @@
            query = phoneMapper.query(2, 2, province, null, null);
        }
        map.put("company", null != query ? query.getPhone() : "");
        try {
            String wechat = "";
            List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", query==null?1:query.getCompanyId()));
            for (SysReformist sysReformist : companyId) {
                wechat = sysReformist.getUserQrCode();
            }
            map.put("wechatUrl",wechat);
        }catch (Exception e){
            e.printStackTrace();
        }

        return map;
    }
}

			@@ -1,6 +1,7 @@
			package com.stylefeng.guns.modular.api;

			import com.alibaba.fastjson.JSON;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.stylefeng.guns.core.util.ToolUtil;
			import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
			import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
			@@ -8,15 +9,13 @@
			import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
			import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
			import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
			import com.stylefeng.guns.modular.system.model.Income;
			import com.stylefeng.guns.modular.system.model.UserInfo;
			import com.stylefeng.guns.modular.system.dao.SysReformistMapper;
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.util.ALiSendSms;
			//import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
			import com.stylefeng.guns.modular.system.util.CompareFace;
			import com.stylefeng.guns.modular.system.util.HuaWeiSMSUtil;
			import com.stylefeng.guns.modular.system.warpper.ActivityWarpper;
			import com.stylefeng.guns.modular.system.model.Driver;
			import com.stylefeng.guns.modular.system.model.OrderPosition;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import com.stylefeng.guns.modular.system.warpper.*;
			@@ -76,7 +75,8 @@
			@Autowired
			private IOrderLogisticsService orderLogisticsService;


			@Autowired
			private SysReformistMapper sysReformistMapper;

			/**
			* 获取短信验证码
			@@ -333,7 +333,7 @@
			}

			@ResponseBody
			@PostMapping("/base/driver/face")
			@PostMapping("/api/driver/face")
			@ApiOperation(value = "面容识别", tags = {"司机端-登录"}, notes = "")
			@ApiImplicitParams({
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
			@@ -750,7 +750,14 @@
			if(null == uid){
			return ResultUtil.tokenErr();
			}
			Map<String, Object> map = driverService.queryPhone(uid);
			String wechat = "";
			Driver driver = driverService.selectById(uid);
			List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", driver.getCompanyId()));
			for (SysReformist sysReformist : companyId) {
			wechat = sysReformist.getDriverQrCode();
			}

			Map<String, Object> map = driverService.queryPhone(uid,wechat);
			return ResultUtil.success(map);
			}catch (Exception e){
			e.printStackTrace();

			@@ -1,6 +1,9 @@
			package com.stylefeng.guns.modular.api;

			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.netflix.ribbon.proxy.annotation.Http;
			import com.stylefeng.guns.modular.system.dao.SysReformistMapper;
			import com.stylefeng.guns.modular.system.model.Driver;
			import com.stylefeng.guns.modular.system.model.DriverService;
			import com.stylefeng.guns.modular.system.model.Phone;
			import com.stylefeng.guns.modular.system.model.SysReformist;
			@@ -35,7 +38,7 @@
			@Autowired
			private IDriverService driverService;
			@Autowired
			private SysReformist
			private SysReformistMapper sysReformistMapper;


			/**
			@@ -49,9 +52,20 @@
			@ApiImplicitParams({
			@ApiImplicitParam(value = "当前定位行政区域编号", name = "code", required = true, dataType = "string"),
			})
			public ResultUtil queryCustomerPhone(String code){
			public ResultUtil queryCustomerPhone(String code,HttpServletRequest request){
			try {
			Map<String, Object> map = phoneService.queryCustomerPhone(code);
			Integer uid = driverService.getUserIdFormRedis(request);
			if(null == uid){
			return ResultUtil.tokenErr();
			}
			String wechat = "";
			Driver driver = driverService.selectById(uid);
			List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", driver.getCompanyId()));
			for (SysReformist sysReformist : companyId) {
			wechat = sysReformist.getDriverQrCode();
			}

			Map<String, Object> map = phoneService.queryCustomerPhone(code,wechat);
			return ResultUtil.success(map);
			}catch (Exception e){
			e.printStackTrace();
			@@ -59,24 +73,28 @@
			}
			}

			@ResponseBody
			@PostMapping("/queryWechatPic")
			@ApiOperation(value = "获取客服二维码", tags = {"司机端-首页"})
			@ApiImplicitParams({
			@ApiImplicitParam(value = "当前定位行政区域编号", name = "code", required = true, dataType = "string"),
			})
			public ResultUtil queryCustomerWechat(String code, HttpServletRequest request){
			try {
			Integer uid = driverService.getUserIdFormRedis(request);
			if(null == uid){
			return ResultUtil.tokenErr();
			}

			return
			}catch (Exception e){
			e.printStackTrace();
			return ResultUtil.runErr();
			}

			}
			// @ResponseBody
			// @PostMapping("/queryWechatPic")
			// @ApiOperation(value = "获取客服二维码", tags = {"司机端-首页"})
			// @ApiImplicitParams({
			// @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			// })
			// public ResultUtil queryCustomerWechat(HttpServletRequest request){
			// try {
			// Integer uid = driverService.getUserIdFormRedis(request);
			// if(null == uid){
			// return ResultUtil.tokenErr();
			// }
			// Driver driver = driverService.selectById(uid);
			// List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", driver.getCompanyId()));
			// for (SysReformist sysReformist : companyId) {
			// return ResultUtil.success(sysReformist.getDriverQrCode());
			// }
			//
			// }catch (Exception e){
			// e.printStackTrace();
			// return ResultUtil.runErr();
			// }
			// return ResultUtil.error("请稍后重试");
			// }
			}

			@@ -18,7 +18,7 @@
			select
			b.id as id,
			a.id as lineShiftDriverId,
			b.startTime as startTime,
			CONCAT(b.startTime,"-",b.endTime) as startTime,
			c.headImgUrl as headImgUrl,
			CONCAT(left(c.`name`, 1), '师傅') as `name`,
			d.carLicensePlate as carLicensePlate,

			@@ -137,11 +137,17 @@
			map.put("price", jsonObject.getString("num1"));
			data = map;
			list.add(data);
			if (lineShift.getStartTime().equals(lineShift.getEndTime())){
			data.put("startTime",lineShift.getStartTime());
			}
			}
			}
			if(b){
			data.put("id", lineShift.getId());
			data.put("startTime", lineShift.getStartTime());
			data.put("startTime", lineShift.getStartTime()+"-"+lineShift.getEndTime());
			if (lineShift.getStartTime().equals(lineShift.getEndTime())){
			data.put("startTime",lineShift.getStartTime());
			}
			list.add(data);
			}
			}

			@@ -4,11 +4,13 @@
			import com.baomidou.mybatisplus.annotations.TableId;
			import com.baomidou.mybatisplus.annotations.TableName;
			import com.baomidou.mybatisplus.enums.IdType;
			import lombok.Data;

			/**
			* 订单改派金额设置
			*/
			@TableName("t_sys_reformist")
			@Data
			public class SysReformist {
			/**
			* 主键
			@@ -38,6 +40,14 @@
			*/
			@TableField("isTaxiCar")
			private Integer isTaxiCar;
			/**
			* 用户端客服二维码
			*/
			private String userQrCode;
			/**
			* 司机端客服二维码
			*/
			private String driverQrCode;

			public Integer getId() {
			return id;

			@@ -209,7 +209,7 @@
			* @return
			* @throws Exception
			*/
			Map<String, Object> queryPhone(Integer uid) throws Exception;
			Map<String, Object> queryPhone(Integer uid,String wechat) throws Exception;


			/**

			@@ -22,5 +22,5 @@
			* @return
			* @throws Exception
			*/
			Map<String, Object> queryCustomerPhone(String code) throws Exception;
			Map<String, Object> queryCustomerPhone(String code,String wechat) throws Exception;
			}

			@@ -839,11 +839,12 @@
			* @throws Exception
			*/
			@Override
			public Map<String, Object> queryPhone(Integer uid) throws Exception {
			public Map<String, Object> queryPhone(Integer uid,String wechat) throws Exception {
			Driver driver = this.selectById(uid);
			Company company = companyMapper.selectById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
			driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
			Map<String, Object> map = new HashMap<>();
			map.put("wechatUrl",wechat);
			if(company.getType() == 3){//加盟商
			Phone phone = phoneMapper.queryInfo(company.getId(), 2);
			map.put("franchisee", null != phone ? phone.getPhone() : "");
			@@ -861,6 +862,7 @@
			}else{
			map.put("platform", "");
			}

			return map;
			}
			if(company.getType() == 2){//分公司

			@@ -46,7 +46,7 @@
			* @throws Exception
			*/
			@Override
			public Map<String, Object> queryCustomerPhone(String code) throws Exception {
			public Map<String, Object> queryCustomerPhone(String code,String wechat) throws Exception {
			String province = code.substring(0, 2) + "0000";
			String city = code.substring(0, 4) + "00";

			@@ -74,6 +74,8 @@
			query = phoneMapper.query(3, null, province, null, null);
			}
			map.put("scheduling", null != query ? query.getPhone() : "");

			map.put("wechatUrl",wechat);
			return map;
			}
			}

			@@ -13,7 +13,7 @@
			application:
			name: driver-server
			profiles:
			active: produce
			active: dev
			mvc:
			static-path-pattern: /static/**
			view:

New file
			@@ -0,0 +1,14 @@
			<component name="InspectionProjectProfileManager">
			<profile version="1.0">
			<option name="myName" value="Project Default" />
			<inspection_tool class="AliAccessStaticViaInstance" enabled="true" level="WARNING" enabled_by_default="true" />
			<inspection_tool class="AliArrayNamingShouldHaveBracket" enabled="true" level="WARNING" enabled_by_default="true" />
			<inspection_tool class="AliControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
			<inspection_tool class="AliDeprecation" enabled="true" level="WARNING" enabled_by_default="true" />
			<inspection_tool class="AliEqualsAvoidNull" enabled="true" level="WARNING" enabled_by_default="true" />
			<inspection_tool class="AliLongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" />
			<inspection_tool class="AliMissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
			<inspection_tool class="AliWrapperTypeEquality" enabled="true" level="WARNING" enabled_by_default="true" />
			<inspection_tool class="MapOrSetKeyShouldOverrideHashCodeEquals" enabled="true" level="WARNING" enabled_by_default="true" />
			</profile>
			</component>

			@@ -12,7 +12,6 @@
			import com.stylefeng.guns.modular.system.util.DateUtil;
			import com.stylefeng.guns.modular.system.util.RedisUtil;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import com.sun.org.apache.regexp.internal.RE;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Controller;
			import org.springframework.ui.Model;

			@@ -57,7 +57,7 @@

			spring:
			datasource:
			url: jdbc:mysql://127.0.0.1:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
			url: jdbc:mysql://192.168.110.34:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
			username: root
			password: 123456
			db-name: guns #用来搜集数据库的所有表

			@@ -1,107 +1,8 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
			<module version="4">
			<component name="FacetManager">
			<facet type="web" name="Web">
			<configuration>
			<webroots />
			</configuration>
			</facet>
			<facet type="Spring" name="Spring">
			<configuration />
			</facet>
			</component>
			<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
			<output url="file://$MODULE_DIR$/target/classes" />
			<output-test url="file://$MODULE_DIR$/target/test-classes" />
			<content url="file://$MODULE_DIR$">
			<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
			<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
			<excludeFolder url="file://$MODULE_DIR$/target" />
			</content>
			<orderEntry type="inheritedJdk" />
			<orderEntry type="sourceFolder" forTests="false" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatisplus-spring-boot-starter:1.0.5" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-support:2.3" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:2.3" level="project" />
			<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.1" level="project" />
			<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
			<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3" level="project" />
			<orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
			<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
			<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
			<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.11" level="project" />
			<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
			<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
			<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
			<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
			<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
			<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
			<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
			<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.5" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.5" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.32" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-web:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-webmvc:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.zxing:core:3.2.1" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.ehcache:ehcache:3.3.1" level="project" />
			<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-context-support:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
			<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
			<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
			<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
			<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
			<orderEntry type="library" name="Maven: org.apache.poi:poi-examples:3.9" level="project" />
			<orderEntry type="library" name="Maven: org.apache.poi:poi-excelant:3.9" level="project" />
			<orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
			<orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
			<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
			<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
			<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
			<orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.9" level="project" />
			<orderEntry type="library" name="Maven: com.huaweicloud:esdk-obs-java:3.19.5" level="project" />
			<orderEntry type="library" name="Maven: com.jamesmurty.utils:java-xmlbuilder:1.1" level="project" />
			<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
			<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
			<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.10.0" level="project" />
			<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
			</component>
			</module>

			@@ -1,63 +1,8 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
			<module version="4">
			<component name="FacetManager">
			<facet type="Spring" name="Spring">
			<configuration />
			</facet>
			</component>
			<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
			<output url="file://$MODULE_DIR$/target/classes" />
			<output-test url="file://$MODULE_DIR$/target/test-classes" />
			<content url="file://$MODULE_DIR$">
			<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
			<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
			<excludeFolder url="file://$MODULE_DIR$/target" />
			</content>
			<orderEntry type="inheritedJdk" />
			<orderEntry type="sourceFolder" forTests="false" />
			<orderEntry type="module" module-name="guns-core (2)" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatisplus-spring-boot-starter:1.0.5" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:2.3" level="project" />
			<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.1" level="project" />
			<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
			<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
			<orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
			<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
			<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
			<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.11" level="project" />
			<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
			<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
			<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
			<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
			<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
			<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
			<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
			<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
			<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
			<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
			<orderEntry type="library" name="Maven: com.ibeetl:beetl:2.8.5" level="project" />
			<orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.2" level="project" />
			<orderEntry type="library" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.1" level="project" />
			<orderEntry type="library" name="Maven: org.antlr:antlr4-annotations:4.2" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-support:2.3" level="project" />
			</component>
			</module>

			@@ -1,12 +1,8 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
			<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
			<output url="file://$MODULE_DIR$/target/classes" />
			<output-test url="file://$MODULE_DIR$/target/test-classes" />
			<content url="file://$MODULE_DIR$">
			<component name="AdditionalModuleElements">
			<content url="file://$MODULE_DIR$" dumb="true">
			<excludeFolder url="file://$MODULE_DIR$/target" />
			</content>
			<orderEntry type="inheritedJdk" />
			<orderEntry type="sourceFolder" forTests="false" />
			</component>
			</module>

			@@ -1,103 +1,8 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
			<module version="4">
			<component name="FacetManager">
			<facet type="web" name="Web">
			<configuration>
			<webroots />
			</configuration>
			</facet>
			<facet type="Spring" name="Spring">
			<configuration />
			</facet>
			</component>
			<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
			<output url="file://$MODULE_DIR$/target/classes" />
			<output-test url="file://$MODULE_DIR$/target/test-classes" />
			<content url="file://$MODULE_DIR$">
			<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
			<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
			<excludeFolder url="file://$MODULE_DIR$/target" />
			</content>
			<orderEntry type="inheritedJdk" />
			<orderEntry type="sourceFolder" forTests="false" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
			<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
			<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
			<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
			<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
			<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
			<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.5" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.5" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
			<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.32" level="project" />
			<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
			<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
			<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
			<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
			<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
			<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
			<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
			<orderEntry type="module" module-name="guns-core (2)" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatisplus-spring-boot-starter:1.0.5" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-support:2.3" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:2.3" level="project" />
			<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.1" level="project" />
			<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
			<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
			<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3" level="project" />
			<orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
			<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
			<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
			<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.11" level="project" />
			<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" level="project" />
			<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
			<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
			<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
			<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
			<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
			</component>
			</module>

New file
			@@ -0,0 +1,17 @@
			package com.stylefeng.guns.modular.system.dao;

			import com.baomidou.mybatisplus.mapper.BaseMapper;
			import com.stylefeng.guns.modular.system.model.SysReformist;
			import org.apache.ibatis.annotations.Param;

			public interface SysReformistMapper extends BaseMapper<SysReformist> {


			/**
			* 获取改派金额
			* @param companyId
			* @return
			* @throws Exception
			*/
			Double queryMoney(@Param("companyId") Integer companyId) throws Exception;
			}

New file
			@@ -0,0 +1,19 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.stylefeng.guns.modular.system.dao.SysReformistMapper">

			<!-- 通用查询映射结果 -->
			<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.SysReformist">
			<id column="id" property="id"/>
			<result column="companyId" property="companyId"/>
			<result column="money" property="money"/>
			<result column="isSpecialCar" property="isSpecialCar"/>
			<result column="isTaxiCar" property="isTaxiCar"/>
			</resultMap>



			<select id="queryMoney" resultType="double">
			select money from t_sys_reformist where companyId = #{companyId}
			</select>
			</mapper>

New file
			@@ -0,0 +1,102 @@
			package com.stylefeng.guns.modular.system.model;

			import com.baomidou.mybatisplus.annotations.TableField;
			import com.baomidou.mybatisplus.annotations.TableId;
			import com.baomidou.mybatisplus.annotations.TableName;
			import com.baomidou.mybatisplus.enums.IdType;
			import lombok.Data;

			/**
			* 订单改派金额设置
			*/
			@TableName("t_sys_reformist")
			@Data
			public class SysReformist {
			/**
			* 主键
			*/
			@TableId(value = "id", type = IdType.AUTO)
			@TableField("id")
			private Integer id;
			/**
			* 企业id
			*/
			@TableField("companyId")
			private Integer companyId;
			/**
			* 金额
			*/
			@TableField("money")
			private Double money;
			/**
			* 专车是否允许改派（1=否，2=是）
			* @return
			*/
			@TableField("isSpecialCar")
			private Integer isSpecialCar;
			/**
			* 出租车是否允许改派（1=否，2=是）
			* @return
			*/
			@TableField("isTaxiCar")
			private Integer isTaxiCar;
			/**
			* 用户端客服二维码
			*/
			private String userQrCode;
			/**
			* 司机端客服二维码
			*/
			private String driverQrCode;

			public Integer getId() {
			return id;
			}

			public void setId(Integer id) {
			this.id = id;
			}

			public Integer getCompanyId() {
			return companyId;
			}

			public void setCompanyId(Integer companyId) {
			this.companyId = companyId;
			}

			public Double getMoney() {
			return money;
			}

			public void setMoney(Double money) {
			this.money = money;
			}

			public Integer getIsSpecialCar() {
			return isSpecialCar;
			}

			public void setIsSpecialCar(Integer isSpecialCar) {
			this.isSpecialCar = isSpecialCar;
			}

			public Integer getIsTaxiCar() {
			return isTaxiCar;
			}

			public void setIsTaxiCar(Integer isTaxiCar) {
			this.isTaxiCar = isTaxiCar;
			}

			@Override
			public String toString() {
			return "SysReformist{" +
			"id=" + id +
			", companyId=" + companyId +
			", money=" + money +
			", isSpecialCar=" + isSpecialCar +
			", isTaxiCar=" + isTaxiCar +
			'}';
			}
			}

			@@ -1,10 +1,15 @@
			package com.stylefeng.guns.modular.system.service.impl;

			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.service.impl.ServiceImpl;
			import com.stylefeng.guns.core.util.ToolUtil;
			import com.stylefeng.guns.modular.system.dao.PhoneMapper;
			import com.stylefeng.guns.modular.system.dao.SysReformistMapper;
			import com.stylefeng.guns.modular.system.model.Driver;
			import com.stylefeng.guns.modular.system.model.Phone;
			import com.stylefeng.guns.modular.system.model.SysReformist;
			import com.stylefeng.guns.modular.system.service.IPhoneService;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			@@ -19,6 +24,8 @@

			@Resource
			private PhoneMapper phoneMapper;
			@Autowired
			private SysReformistMapper sysReformistMapper;

			/**
			* 获取所有系统电话
			@@ -69,6 +76,17 @@
			query = phoneMapper.query(2, 2, province, null, null);
			}
			map.put("company", null != query ? query.getPhone() : "");
			try {
			String wechat = "";
			List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", query==null?1:query.getCompanyId()));
			for (SysReformist sysReformist : companyId) {
			wechat = sysReformist.getUserQrCode();
			}
			map.put("wechatUrl",wechat);
			}catch (Exception e){
			e.printStackTrace();
			}

			return map;
			}
			}