Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving

puzhibing

2025-08-19 ba6b508a44cb1f0730c6a27a5d73b8d2ae8f1d4b

 driver/.idea/workspace.xml

@@ -1,90 +1,247 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="AutoImportSettings">
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="506548b6-c147-4883-9af0-e22c50455488" name="更改" comment="">
      <change afterPath="$PROJECT_DIR$/../.idea/QYTDriving.iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
    <list default="true" id="f79ed7d7-f686-4837-bcbf-6cc02bfa366f" name="Default Changelist" comment="Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving&#10;&#10;# Conflicts:&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java">
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/config/RedissonConfig.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" 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/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.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/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/.idea/jarRepositories.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/index.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/login.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/compiler.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/jarRepositories.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/encodings.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/misc.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application-dev.yml" afterDir="false" />
    </list>
    <ignored path="$PROJECT_DIR$/target/" />
    <ignored path="$PROJECT_DIR$/guns-core/target/" />
    <ignored path="$PROJECT_DIR$/guns-admin/target/" />
    <ignored path="$PROJECT_DIR$/guns-generator/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="FUSProjectUsageTrigger">
    <session id="524099957">
      <usages-collector id="statistics.lifecycle.project">
        <counts>
          <entry key="project.open.time.3" value="1" />
          <entry key="project.opened" value="1" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.open">
        <counts>
          <entry key="java" value="28" />
          <entry key="yml" value="2" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.types.open">
        <counts>
          <entry key="JAVA" value="28" />
          <entry key="YAML" value="2" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.edit">
        <counts>
          <entry key="java" value="172" />
          <entry key="txt" value="7" />
          <entry key="yml" value="32" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.types.edit">
        <counts>
          <entry key="JAVA" value="172" />
          <entry key="PLAIN_TEXT" value="7" />
          <entry key="YAML" value="32" />
        </counts>
      </usages-collector>
    </session>
  </component>
  <component name="FileEditorManager">
    <leaf>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="398">
              <caret line="490" column="64" selection-start-line="490" selection-start-column="64" selection-end-line="490" selection-end-column="64" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="215">
              <caret line="105" column="22" selection-start-line="105" selection-start-column="22" selection-end-line="105" selection-end-column="22" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="390">
              <caret line="800" column="42" selection-start-line="800" selection-start-column="42" selection-end-line="800" selection-end-column="42" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="162">
              <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
      <find>位置</find>
      <find>daijia_DRIVER</find>
      <find>大厅</find>
      <find>优推</find>
      <find>详情</find>
    </findStrings>
    <replaceStrings>
      <replace>daijia:DRIVER</replace>
    </replaceStrings>
    <dirStrings>
      <dir>E:\IDEA Workspaces\QYTDriving\driver</dir>
      <dir>E:\IDEA Workspaces\QYTDriving\driver\guns-admin\src\main\java\com\supersavedriving\driver\modular\system\api</dir>
      <dir>E:\IDEA Workspaces\QYTDriving\driver\guns-admin\src\main\java\com\supersavedriving\driver</dir>
    </dirStrings>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
  </component>
  <component name="MarkdownSettingsMigration">
    <option name="stateVersion" value="1" />
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java" />
      </list>
    </option>
  </component>
  <component name="ProjectColorInfo">{
  &quot;associatedIndex&quot;: 0
}</component>
  <component name="ProjectId" id="2ya10OJhowlKjAmXiEZ3h9kc7v5" />
  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsGulpfileManager">
    <detection-done>true</detection-done>
    <sorting>DEFINITION_ORDER</sorting>
  </component>
  <component name="MavenImportPreferences">
    <option name="generalSettings">
      <MavenGeneralSettings>
        <option name="localRepository" value="E:\apache-maven\repository" />
        <option name="mavenHome" value="$APPLICATION_HOME_DIR$/plugins/maven/lib/maven3" />
        <option name="userSettingsFile" value="E:\apache-maven\apache-maven-3.6.1\conf\settings.xml" />
      </MavenGeneralSettings>
    </option>
  </component>
  <component name="MavenProjectNavigator">
    <treeState>
      <expand>
        <path>
          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
          <item name="Profiles" type="6783ec58:MavenProjectsStructure$ProfilesNode" />
        </path>
      </expand>
      <select />
    </treeState>
  </component>
  <component name="ProjectFrameBounds">
    <option name="x" value="-7" />
    <option name="y" value="1" />
    <option name="width" value="1932" />
    <option name="height" value="1046" />
  </component>
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
    <option name="showVisibilityIcons" value="true" />
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
              <item name="driver" type="b2602c69:ProjectViewProjectNode" />
              <item name="driver" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="driver" type="b2602c69:ProjectViewProjectNode" />
              <item name="driver" type="462c0819:PsiDirectoryNode" />
              <item name="guns-admin" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="driver" type="b2602c69:ProjectViewProjectNode" />
              <item name="driver" type="462c0819:PsiDirectoryNode" />
              <item name="guns-admin" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="driver" type="b2602c69:ProjectViewProjectNode" />
              <item name="driver" type="462c0819:PsiDirectoryNode" />
              <item name="guns-admin" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
      <pane id="Scope" />
      <pane id="AndroidView" />
      <pane id="PackagesPane" />
    </panes>
  </component>
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
    &quot;Maven.guns-parent [package].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.GunsApplication.executor&quot;: &quot;Debug&quot;,
    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&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;F:/code/QYTDriving/driver&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;project.structure.last.edited&quot;: &quot;项目&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  }
}</component>
  <component name="ReactorSettings">
    <option name="notificationShown" value="true" />
  <component name="PropertiesComponent">
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1755599403253" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../QianYunTong/UserQYTTravel" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
    <property name="project.structure.last.edited" value="Project" />
    <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="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">
    <configuration name="GunsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
    <configuration name="GunsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
      <module name="driver" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.supersavedriving.driver.GunsApplication" />
      <method v="2">
@@ -92,42 +249,324 @@
      </method>
    </configuration>
  </component>
  <component name="SharedIndexes">
    <attachedChunks>
      <set>
        <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.23339.11" />
        <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.23339.11" />
      </set>
    </attachedChunks>
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
  <component name="TaskManager">
    <task active="true" id="Default" summary="默认任务">
      <changelist id="506548b6-c147-4883-9af0-e22c50455488" name="更改" comment="" />
      <created>1750057650671</created>
    <task active="true" id="Default" summary="Default task">
      <changelist id="f79ed7d7-f686-4837-bcbf-6cc02bfa366f" name="Default Changelist" comment="" />
      <created>1755484104324</created>
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
      <updated>1750057650671</updated>
      <workItem from="1750057651793" duration="474000" />
      <workItem from="1754877414171" duration="4492000" />
      <workItem from="1754892516667" duration="3542000" />
      <workItem from="1754899010485" duration="5383000" />
      <workItem from="1754919867199" duration="1906000" />
      <updated>1755484104324</updated>
      <workItem from="1755484107026" duration="12785000" />
    </task>
    <task id="LOCAL-00001" summary="合并代码">
      <created>1755574064887</created>
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
      <updated>1755574064887</updated>
    </task>
    <task id="LOCAL-00002" summary="合并代码">
      <created>1755594108574</created>
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
      <updated>1755594108574</updated>
    </task>
    <option name="localTasksCounter" value="3" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="12785000" />
  </component>
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State />
          </value>
        </entry>
      </map>
    </option>
  <component name="ToolWindowManager">
    <frame x="-7" y="1" width="1932" height="1046" extended-state="0" />
    <layout>
      <window_info id="Designer" />
      <window_info id="Image Layers" />
      <window_info id="UI Designer" />
      <window_info id="Favorites" side_tool="true" />
      <window_info id="Capture Tool" />
      <window_info id="Web" side_tool="true" />
      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info anchor="bottom" id="Spring" />
      <window_info anchor="bottom" id="Terminal" />
      <window_info anchor="bottom" id="Event Log" sideWeight="0.5005342" side_tool="true" weight="0.1679473" />
      <window_info anchor="bottom" id="Statistic" />
      <window_info anchor="bottom" id="Java Enterprise" />
      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
      <window_info anchor="bottom" id="Version Control" weight="0.118551046" />
      <window_info anchor="bottom" id="Messages" visible="true" weight="0.32930845" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" />
      <window_info anchor="bottom" id="Run" order="2" />
      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49946582" weight="0.2107574" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="bottom" id="TODO" order="6" />
      <window_info anchor="right" id="Palette" />
      <window_info anchor="right" id="Capture Analysis" />
      <window_info anchor="right" id="Maven Projects" weight="0.32959402" />
      <window_info anchor="right" id="Database" />
      <window_info anchor="right" id="Palette&#9;" />
      <window_info anchor="right" id="Theme Preview" />
      <window_info anchor="right" id="Bean Validation" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
  <component name="VcsContentAnnotationSettings">
    <option name="myLimit" value="2678400000" />
  </component>
  <component name="VcsManagerConfiguration">
    <MESSAGE value="合并代码" />
    <MESSAGE value="Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving&#10;&#10;# Conflicts:&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java" />
    <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving&#10;&#10;# Conflicts:&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java" />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/resources/application.yml">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="150">
          <caret line="42" column="34" lean-forward="true" selection-start-line="42" selection-start-column="34" selection-end-line="42" selection-end-column="34" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="60">
          <caret line="135" selection-start-line="135" selection-end-line="135" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="395">
          <caret line="57" column="9" lean-forward="true" selection-start-line="52" selection-start-column="22" selection-end-line="52" selection-end-column="32" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IAgentService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="375">
          <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/TBranchOfficeArea.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="550">
          <caret line="32" column="34" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="34" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IBranchOfficeService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="225">
          <caret line="13" column="37" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="37" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="250">
          <caret line="89" column="16" lean-forward="true" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="200">
          <caret line="44" column="60" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="60" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/YouTuiController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="217">
          <caret line="50" column="31" selection-start-line="50" selection-start-column="31" selection-end-line="50" selection-end-column="31" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverYouTuiWarpper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="109">
          <caret line="8" column="24" lean-forward="true" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="362">
          <caret line="250" column="71" selection-start-line="250" selection-start-column="71" selection-end-line="250" selection-end-column="71" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="223">
          <caret line="95" column="21" selection-start-line="95" selection-start-column="21" selection-end-line="95" selection-end-column="21" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="223">
          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/GeodesyUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="231">
          <caret line="23" column="38" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/GaoDe/MapUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="425">
          <caret line="35" column="43" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="223">
          <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="369">
          <caret line="1011" lean-forward="true" selection-start-line="1011" selection-end-line="1011" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="398">
          <caret line="490" column="64" selection-start-line="490" selection-start-column="64" selection-end-line="490" selection-end-column="64" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="215">
          <caret line="105" column="22" selection-start-line="105" selection-start-column="22" selection-end-line="105" selection-end-column="22" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="162">
          <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="390">
          <caret line="800" column="42" selection-start-line="800" selection-start-column="42" selection-end-line="800" selection-end-column="42" />
        </state>
      </provider>
    </entry>
  </component>
  <component name="masterDetails">
    <states>
      <state key="ArtifactsStructureConfigurable.UI">
        <settings>
          <artifact-editor />
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="FacetStructureConfigurable.UI">
        <settings>
          <last-edited>No facets are configured</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="GlobalLibrariesConfigurable.UI">
        <settings>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="JdkListConfigurable.UI">
        <settings>
          <last-edited>1.8</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ModuleStructureConfigurable.UI">
        <settings>
          <last-edited>driver</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
                <option value="0.6" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ProjectJDKs.UI">
        <settings>
          <last-edited>1.8</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ProjectLibrariesConfigurable.UI">
        <settings>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
    </states>
  </component>
</project>