|
|
@@ -8,52 +8,13 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="客户主页后台提交工单接口修改">
|
|
|
- <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/AboutUsDAO.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterCertificationDTO.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/EnterInfoDTO.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/AboutUs.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/AboutUsService.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/AboutUs.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/AboutUsController.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/shelf/_2025_10_9_9_16____.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/_2025_10_9_9_16____.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CommentInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/CommentInfo.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Feedback.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Feedback.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ArgonPartner.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/CommentInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Feedback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Feedback.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/LaborerInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TransportationInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CommentInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CommentInfo.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Feedback.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Feedback.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/WorkOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/WorkOrderService.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/ArgonPartner.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/ArgonPartner.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/CommentInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/CommentInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/CustomerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/CustomerInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/Feedback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/Feedback.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/LaborerInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/LaborerInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TransportationInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/TransportationInfo.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/WorkOrder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/WorkOrder.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/WebMvcConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/WebMvcConfig.class" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageApiController.java" afterDir="false" />
|
|
|
</list>
|
|
|
- <ignored path="$PROJECT_DIR$/target/" />
|
|
|
- <ignored path="$PROJECT_DIR$/common/target/" />
|
|
|
- <ignored path="$PROJECT_DIR$/web/target/" />
|
|
|
- <ignored path="D:\java\idea-workspace\water-tank-installation-server\.idea\shelf/" />
|
|
|
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
- <option name="TRACKING_ENABLED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
@@ -272,6 +233,9 @@
|
|
|
<select />
|
|
|
</treeState>
|
|
|
</component>
|
|
|
+ <component name="ProjectColorInfo"><![CDATA[{
|
|
|
+ "associatedIndex": 3
|
|
|
+}]]></component>
|
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
|
<option name="x" value="-8" />
|
|
|
<option name="width" value="1616" />
|
|
|
@@ -280,6 +244,7 @@
|
|
|
<component name="ProjectId" id="337s95eD0AWjTqoZYAdQAY8e2Z9" />
|
|
|
<component name="ProjectLevelVcsManager">
|
|
|
<OptionsSetting value="false" id="Update" />
|
|
|
+ <ConfirmationsSetting value="2" id="Add" />
|
|
|
</component>
|
|
|
<component name="ProjectView">
|
|
|
<navigator proportions="" version="1">
|
|
|
@@ -391,15 +356,11 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
|
- <component name="PropertiesComponent">
|
|
|
- <property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
- <property name="aspect.path.notification.shown" value="true" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../floorlock-server" />
|
|
|
- <property name="project.structure.last.edited" value="Modules" />
|
|
|
- <property name="project.structure.proportion" value="0.0" />
|
|
|
- <property name="project.structure.side.proportion" value="0.0" />
|
|
|
- <property name="settings.editor.selected.configurable" value="MavenSettings" />
|
|
|
- </component>
|
|
|
+ <component name="PropertiesComponent"><![CDATA[{
|
|
|
+ "keyToString": {
|
|
|
+ "应用程序.EmploymentApplication.executor": "Debug"
|
|
|
+ }
|
|
|
+}]]></component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyClassDialog.RECENTS_KEY">
|
|
|
<recent name="com.jpsoft.employment.modules.mobile.controller" />
|
|
|
@@ -412,19 +373,7 @@
|
|
|
<recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\resources\mapper\base" />
|
|
|
</key>
|
|
|
</component>
|
|
|
- <component name="RunDashboard">
|
|
|
- <option name="ruleStates">
|
|
|
- <list>
|
|
|
- <RuleState>
|
|
|
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
|
- </RuleState>
|
|
|
- <RuleState>
|
|
|
- <option name="name" value="StatusDashboardGroupingRule" />
|
|
|
- </RuleState>
|
|
|
- </list>
|
|
|
- </option>
|
|
|
- </component>
|
|
|
- <component name="RunManager" selected="Application.EmploymentApplication">
|
|
|
+ <component name="RunManager" selected="应用程序.EmploymentApplication">
|
|
|
<configuration name="EmploymentApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
|
<option name="MAIN_CLASS_NAME" value="com.jpsoft.employment.EmploymentApplication" />
|
|
|
<module name="web" />
|
|
|
@@ -434,22 +383,24 @@
|
|
|
<option name="ENABLED" value="true" />
|
|
|
</pattern>
|
|
|
</extension>
|
|
|
+ <method v="2">
|
|
|
+ <option name="Make" enabled="true" />
|
|
|
+ </method>
|
|
|
</configuration>
|
|
|
<configuration name="EmploymentApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
|
<module name="web" />
|
|
|
<option name="SPRING_BOOT_MAIN_CLASS" value="com.jpsoft.employment.EmploymentApplication" />
|
|
|
</configuration>
|
|
|
<list>
|
|
|
- <item itemvalue="Spring Boot.EmploymentApplication" />
|
|
|
- <item itemvalue="Application.EmploymentApplication" />
|
|
|
+ <item itemvalue="应用程序.EmploymentApplication" />
|
|
|
</list>
|
|
|
<recent_temporary>
|
|
|
<list>
|
|
|
- <item itemvalue="Application.EmploymentApplication" />
|
|
|
+ <item itemvalue="应用程序.EmploymentApplication" />
|
|
|
</list>
|
|
|
</recent_temporary>
|
|
|
</component>
|
|
|
- <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" />
|
|
|
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="false" />
|
|
|
<component name="SvnConfiguration">
|
|
|
<configuration />
|
|
|
</component>
|
|
|
@@ -589,30 +540,12 @@
|
|
|
<map>
|
|
|
<entry key="MAIN">
|
|
|
<value>
|
|
|
- <State>
|
|
|
- <option name="RECENTLY_FILTERED_USER_GROUPS">
|
|
|
- <collection />
|
|
|
- </option>
|
|
|
- <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
|
|
|
- <collection />
|
|
|
- </option>
|
|
|
- <option name="COLUMN_ORDER">
|
|
|
- <list>
|
|
|
- <option value="0" />
|
|
|
- <option value="1" />
|
|
|
- <option value="2" />
|
|
|
- <option value="3" />
|
|
|
- </list>
|
|
|
- </option>
|
|
|
- </State>
|
|
|
+ <State />
|
|
|
</value>
|
|
|
</entry>
|
|
|
</map>
|
|
|
</option>
|
|
|
</component>
|
|
|
- <component name="VcsContentAnnotationSettings">
|
|
|
- <option name="myLimit" value="2678400000" />
|
|
|
- </component>
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="1.氩气合作方功能,搬运小工管理功能,运输方功能, 2.客户中心手机端接口 3.客户首页数据接口" />
|
|
|
<MESSAGE value="客户端移动端接口 1.客户主页 2.客户发布工单详情 3.客户合作方列表" />
|
|
|
@@ -620,11 +553,6 @@
|
|
|
<MESSAGE value="客户主页后台提交工单接口修改" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="客户主页后台提交工单接口修改" />
|
|
|
</component>
|
|
|
- <component name="XDebuggerManager">
|
|
|
- <breakpoint-manager>
|
|
|
- <option name="time" value="6" />
|
|
|
- </breakpoint-manager>
|
|
|
- </component>
|
|
|
<component name="antWorkspaceConfiguration">
|
|
|
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
|
|
<option name="FILTER_TARGETS" value="false" />
|