Merge remote-tracking branch 'origin/master'

.gitignore

@@ -0,0 +1,3 @@
+/web/target/
+/.idea/
+/common/target/

.idea/workspace.xml

@@ -8,8 +8,241 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="师傅保证金审核">
+      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/config/AliPayJpsoftConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/config/OSSConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/config/WxConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/config/WxJpsoftConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/config/WxProperties.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/config/WxPropertiesApplet.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/exception/CustomException.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/AboutUsDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/ArgonPartnerDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/CommentInfoDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/ConstructionProgressDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/CustomerInfoDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/DepositDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/FeedbackDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/InstallationRequirementDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/LaborerInfoDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/ReceiveRequireDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/RevenueInfoDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/TransportationInfoDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/CustomerDetailDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/EnterCertificationDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/EnterInfoDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/PersonalCenterDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/TechnicianDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/WorkOrderSubDataDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/AboutUs.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ArgonPartner.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CommentInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ConstructionProgress.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Deposit.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Feedback.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/InstallationRequirement.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/LaborerInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/MessageInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ReceiveRequire.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/RevenueInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/TransportationInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/WorkOrder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/AboutUsService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/ArgonPartnerService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/CommentInfoService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/ConstructionProgressService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/CustomerInfoService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/DepositService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/FeedbackService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/InstallationRequirementService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/LaborerInfoService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/ReceiveRequireService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/TechnicianInfoService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/TransportationInfoService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/WorkOrderService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/ArgonPartnerServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/CommentInfoServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/ConstructionProgressServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/CustomerInfoServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/DepositServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/FeedbackServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/InstallationRequirementServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/LaborerInfoServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/ReceiveRequireServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TransportationInfoServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/dto/FileDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/dto/MessageResult.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/dto/MessageResultBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/dto/MessageResultSimple.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/dto/Sort.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/service/BaseService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/service/IRedisService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/service/SmsService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/service/impl/RedisServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/service/impl/SmsServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/AESDATAUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/AESUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/AliyunSmsConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/BASE64DecodedMultipartFile.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/Base64.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/CheckIdCard.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/DES3.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/DateDifferenceInMonths.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/GPSUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/Generator/AbstractCaptchaA.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/Generator/AbstractGeneratorA.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/Generator/CaptchaUtilA.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/Generator/RandomGeneratorA.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/HttpConnectionUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/HttpUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/IdCardUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/JwtUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/JwtUtil2.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/MapUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/MyX509TrustManager.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/NewWordUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/OSSUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/POIUtils$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/POIUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/PojoUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/SMSUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/Sign.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/StringUtils$RandomType.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/StringUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/WechatMessageUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/WeixinUtil$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/WeixinUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/enterprise/AesException.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/enterprise/ByteGroup.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/enterprise/PKCS7Encoder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/enterprise/SHA1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/enterprise/WXBizMsgCrypt.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/enterprise/XMLParse.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dao/DataDictionaryDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dao/MenuDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dao/PermissionDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dao/RoleDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dao/RoleMenuDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dao/RolePermissionDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dao/SysLogDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dao/UserDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dao/UserRoleDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/dto/RoleRelatedDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/DataDictionary.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/Menu.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/Permission.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/Role.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/RoleMenu.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/RolePermission.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/SysLog.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/User.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/UserRole.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/entity/UserVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/DataDictionaryService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/MenuService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/PermissionService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/RoleMenuService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/RolePermissionService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/RoleService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/SysLogService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/UserRoleService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/UserService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/impl/DataDictionaryServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/impl/MenuServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/impl/PermissionServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/impl/RoleMenuServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/impl/RolePermissionServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/impl/RoleServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/impl/SysLogServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/impl/UserRoleServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/sys/service/impl/UserServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/wechat/entity/AccessToken.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/wechat/entity/SessionKey.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/wechat/vo/UserInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/ArgonPartner.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/CommentInfo.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/ConstructionProgress.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/CustomerInfo.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/Deposit.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/Feedback.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/InstallationRequirement.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/LaborerInfo.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/MessageInfo.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/ReceiveRequire.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/RevenueInfo.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TransportationInfo.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/WorkOrder.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/sys/DataDictionary.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/sys/Menu.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/sys/Permission.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/sys/Role.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/sys/RoleMenu.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/sys/RolePermission.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/sys/SysLog.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/sys/User.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/sys/UserRole.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/application-dev.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/application-production.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/application-test.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/application.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/EmploymentApplication.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/advice/DAOAdvice.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/advice/GlobalExceptionHandler.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/advice/ValidatorAdvice.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/RedisConfig$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/RedisConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/ScheduleConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/SwaggerConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/WebMvcConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/interceptor/LoginInterceptor.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/AboutUsController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/CommentInfoController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/ConstructionProgressController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/CustomerInfoController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/DepositController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/FeedbackController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/InstallationRequirementController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/LaborerInfoController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/MessageInfoController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/ReceiveRequireController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/RevenueInfoController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/TechnicianInfoController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/TransportationInfoController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/WorkOrderController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/common/controller/JwtsUserController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/common/controller/TinymceController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/common/controller/fileUploadController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/MessageApiController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/ResourceApiController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/sys/controller/ApiController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/sys/controller/DataDictionaryController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/sys/controller/LogController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/sys/controller/MenuController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/sys/controller/PermissionController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/sys/controller/RoleController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/sys/controller/UserController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/wechat/callback/EventCallback.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/wechat/controller/WxController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/lotteryActivity/utils/POIUtils$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/lotteryActivity/utils/POIUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/logback-spring.xml" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -199,10 +432,9 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="customMavenHome" value="D:\Specialized Files\apache-maven-3.5.0" />
-        <option name="localRepository" value="D:\Specialized Files\apache-maven-3.5.0\maven-repository" />
+        <option name="customMavenHome" value="D:\Develop Files\apache-maven-3.5.0" />
         <option name="mavenHomeTypeForPersistence" value="CUSTOM" />
-        <option name="userSettingsFile" value="D:\Specialized Files\apache-maven-3.5.0\conf\settings.xml" />
+        <option name="userSettingsFile" value="D:\Develop Files\apache-maven-3.5.0\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
@@ -357,6 +589,7 @@
   <component name="PropertiesComponent">{
   &quot;keyToString&quot;: {
     &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;Maven.parent [install].executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
     &quot;git-widget-placeholder&quot;: &quot;master&quot;,
@@ -403,7 +636,6 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Spring Boot.EmploymentApplication" />
       <item itemvalue="应用程序.EmploymentApplication" />
     </list>
     <recent_temporary>
@@ -412,13 +644,6 @@
       </list>
     </recent_temporary>
   </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-jdk-30f59d01ecdd-26cb7f24e5b0-intellij.indexing.shared.core-IU-253.29346.138" />
-      </set>
-    </attachedChunks>
-  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
@@ -527,7 +752,15 @@
       <option name="project" value="LOCAL" />
       <updated>1768381527958</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="2026020403">
+      <option name="closed" value="true" />
+      <created>1770196993594</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1770196993594</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -649,6 +882,7 @@
     <MESSAGE value="客户端移动端接口&#10;1.客户主页后台接口新增&#10;2.客户发布工单详情&#10;3.客户合作方列表" />
     <MESSAGE value="客户主页后台提交工单接口修改" />
     <MESSAGE value="师傅端移动接口" />
+    <MESSAGE value="2026020403" />
     <MESSAGE value="师傅保证金审核" />
     <option name="LAST_COMMIT_MESSAGE" value="师傅保证金审核" />
   </component>