wms / wms_mijiangshiye · Files

Blame view

.idea/workspace.xml 27.3 KB
Edit Raw Normal View History
初始化分支
db744b72
 
tangying authored 
1
2
3
 
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ChangeListManager">
添加userWarehouse
08918cf7
 
mahuandong authored 
4
 
    <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
库区设置编辑
69aa10ad
 
pengcheng authored 
5
 
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
修复页面字典明细报错
68796bc7
 
xqs authored 
6
7
8
9
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" afterDir="false" />
初始化分支
db744b72
 
tangying authored 
10
 
    </list>
配置文件更新修改
2d5841d3
 
xqs authored 
11
 
    <ignored path="$PROJECT_DIR$/target/" />
初始化分支
db744b72
 
tangying authored 
12
13
14
15
16
17
 
    <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>
maven
81c737f9
 
pengcheng authored 
18
 
  <component name="DatabaseView">
修改客户页面
0c8a451b
 
mahuandong authored 
19
 
    <option name="SHOW_INTERMEDIATE" value="false" />
maven
81c737f9
 
pengcheng authored 
20
21
22
23
24
 
    <option name="GROUP_DATA_SOURCES" value="true" />
    <option name="GROUP_SCHEMA" value="true" />
    <option name="GROUP_CONTENTS" value="false" />
    <option name="SORT_POSITIONED" value="false" />
    <option name="SHOW_EMPTY_GROUPS" value="false" />
修改客户页面
0c8a451b
 
mahuandong authored 
25
 
    <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
maven
81c737f9
 
pengcheng authored 
26
27
28
 
    <option name="HIDDEN_KINDS">
      <set />
    </option>
修复页面字典明细报错
68796bc7
 
xqs authored 
29
 
    <expand />
maven
81c737f9
 
pengcheng authored 
30
31
 
    <select />
  </component>
配置文件更新修改
2d5841d3
 
xqs authored 
32
33
 
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
修复页面字典明细报错
68796bc7
 
xqs authored 
34
 
      <file pinned="false" current-in-tab="false">
配置文件更新修改
2d5841d3
 
xqs authored 
35
36
 
        <entry file="file://$PROJECT_DIR$/pom.xml">
          <provider selected="true" editor-type-id="text-editor">
修复页面字典明细报错
68796bc7
 
xqs authored 
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
 
            <state relative-caret-position="6480">
              <caret line="324" column="43" selection-start-line="324" selection-start-column="43" selection-end-line="324" selection-end-column="43" />
            </state>
          </provider>
          <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="88">
              <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="2980">
              <caret line="149" column="10" lean-forward="true" selection-start-line="149" selection-start-column="10" selection-end-line="149" selection-end-column="10" />
配置文件更新修改
2d5841d3
 
xqs authored 
58
59
60
61
62
 
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
修复页面字典明细报错
68796bc7
 
xqs authored 
63
 
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
配置文件更新修改
2d5841d3
 
xqs authored 
64
 
          <provider selected="true" editor-type-id="text-editor">
修复页面字典明细报错
68796bc7
 
xqs authored 
65
66
67
68
69
 
            <state relative-caret-position="372">
              <caret line="311" column="16" selection-start-line="311" selection-start-column="16" selection-end-line="311" selection-end-column="16" />
              <folding>
                <element signature="imports" expanded="true" />
              </folding>
配置文件更新修改
2d5841d3
 
xqs authored 
70
71
72
73
74
 
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
修复页面字典明细报错
68796bc7
 
xqs authored 
75
76
77
78
79
80
 
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/service/ExcelReportService.java">
          <provider selected="true" editor-type-id="text-editor" />
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
配置文件更新修改
2d5841d3
 
xqs authored 
81
 
          <provider selected="true" editor-type-id="text-editor">
修复页面字典明细报错
68796bc7
 
xqs authored 
82
83
84
85
86
87
 
            <state relative-caret-position="113">
              <caret line="147" column="39" selection-start-line="147" selection-start-column="39" selection-end-line="147" selection-end-column="39" />
              <folding>
                <element signature="e#3376#3377#0" expanded="true" />
                <element signature="e#3415#3416#0" expanded="true" />
              </folding>
配置文件更新修改
2d5841d3
 
xqs authored 
88
89
90
91
92
93
 
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
94
95
96
97
98
99
100
 
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
        <option value="Class" />
      </list>
    </option>
  </component>
初始化分支
db744b72
 
tangying authored 
101
 
  <component name="Git.Settings">
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
102
 
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
库区设置编辑
69aa10ad
 
pengcheng authored 
103
104
 
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
修改客户页面
0c8a451b
 
mahuandong authored 
105
 
        <entry key="$PROJECT_DIR$" value="master" />
库区设置编辑
69aa10ad
 
pengcheng authored 
106
107
 
      </map>
    </option>
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
108
 
  </component>
配置文件更新修改
2d5841d3
 
xqs authored 
109
110
111
112
113
 
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
        <option value="$PROJECT_DIR$/pom.xml" />
修复页面字典明细报错
68796bc7
 
xqs authored 
114
115
116
 
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
配置文件更新修改
2d5841d3
 
xqs authored 
117
118
119
 
      </list>
    </option>
  </component>
maven
81c737f9
 
pengcheng authored 
120
121
122
 
  <component name="IgnoredFileRootStore">
    <option name="generatedRoots">
      <set>
修改客户页面
0c8a451b
 
mahuandong authored 
123
 
        <option value="E:\code\wms2\.idea" />
maven
81c737f9
 
pengcheng authored 
124
125
126
 
      </set>
    </option>
  </component>
配置文件更新修改
2d5841d3
 
xqs authored 
127
128
129
130
131
132
133
 
  <component name="MavenImportPreferences">
    <option name="importingSettings">
      <MavenImportingSettings>
        <option name="importAutomatically" value="true" />
      </MavenImportingSettings>
    </option>
  </component>
修复页面字典明细报错
68796bc7
 
xqs authored 
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
 
  <component name="MavenProjectNavigator">
    <treeState>
      <expand>
        <path>
          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
          <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
        </path>
        <path>
          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
          <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
        </path>
      </expand>
      <select />
    </treeState>
  </component>
  <component name="MavenRunner">
    <option name="skipTests" value="true" />
  </component>
Merge branch 'develop' of http:/...
d9319430
 
wangyanxiong authored 
153
 
  <component name="ProjectFrameBounds" extendedState="6">
配置文件更新修改
2d5841d3
 
xqs authored 
154
155
156
157
 
    <option name="x" value="-1928" />
    <option name="y" value="-8" />
    <option name="width" value="1936" />
    <option name="height" value="1056" />
Merge branch 'develop' of http:/...
d9319430
 
wangyanxiong authored 
158
 
  </component>
修改客户页面
0c8a451b
 
mahuandong authored 
159
160
161
 
  <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
  <component name="ProjectLevelVcsManager">
    <ConfirmationsSetting value="2" id="Add" />
初始化分支
db744b72
 
tangying authored 
162
 
  </component>
配置文件更新修改
2d5841d3
 
xqs authored 
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
 
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
修复页面字典明细报错
68796bc7
 
xqs authored 
215
216
217
218
219
220
221
222
223
224
 
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
配置文件更新修改
2d5841d3
 
xqs authored 
225
226
 
              <item name="resources" type="462c0819:PsiDirectoryNode" />
            </path>
修复页面字典明细报错
68796bc7
 
xqs authored 
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
 
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="system" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="system" type="462c0819:PsiDirectoryNode" />
              <item name="dict" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="system" type="462c0819:PsiDirectoryNode" />
              <item name="dict" type="462c0819:PsiDirectoryNode" />
              <item name="data" type="462c0819:PsiDirectoryNode" />
            </path>
配置文件更新修改
2d5841d3
 
xqs authored 
265
266
267
268
 
          </expand>
          <select />
        </subPane>
      </pane>
修复页面字典明细报错
68796bc7
 
xqs authored 
269
 
      <pane id="Scope" />
配置文件更新修改
2d5841d3
 
xqs authored 
270
271
272
 
      <pane id="PackagesPane" />
    </panes>
  </component>
初始化分支
db744b72
 
tangying authored 
273
 
  <component name="PropertiesComponent">
修改客户页面
0c8a451b
 
mahuandong authored 
274
 
    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
maven
81c737f9
 
pengcheng authored 
275
 
    <property name="DatabaseDriversLRU" value="mysql" />
添加userWarehouse
08918cf7
 
mahuandong authored 
276
 
    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
库区设置编辑
69aa10ad
 
pengcheng authored 
277
278
279
280
 
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
初始化分支
db744b72
 
tangying authored 
281
282
283
 
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
修改客户页面
0c8a451b
 
mahuandong authored 
284
285
286
287
288
289
290
 
    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
    <property name="node.js.detected.package.eslint" value="true" />
    <property name="node.js.detected.package.tslint" value="true" />
    <property name="node.js.path.for.package.eslint" value="project" />
    <property name="node.js.path.for.package.tslint" value="project" />
    <property name="node.js.selected.package.eslint" value="(autodetect)" />
    <property name="node.js.selected.package.tslint" value="(autodetect)" />
修复页面字典明细报错
68796bc7
 
xqs authored 
291
 
    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
初始化分支
db744b72
 
tangying authored 
292
 
  </component>
maven
81c737f9
 
pengcheng authored 
293
 
  <component name="RecentsManager">
修改客户页面
0c8a451b
 
mahuandong authored 
294
295
296
 
    <key name="MoveFile.RECENT_KEYS">
      <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
      <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
maven
81c737f9
 
pengcheng authored 
297
298
 
    </key>
  </component>
初始化分支
db744b72
 
tangying authored 
299
300
301
302
303
304
305
306
307
308
309
310
 
  <component name="RunDashboard">
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
  </component>
Merge branch 'develop' of http:/...
34ed17de
 
wangyanxiong authored 
311
 
  <component name="RunManager">
修改客户页面
0c8a451b
 
mahuandong authored 
312
 
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
配置文件更新修改
2d5841d3
 
xqs authored 
313
 
      <module name="wms2" />
修改客户页面
0c8a451b
 
mahuandong authored 
314
 
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
配置文件更新修改
2d5841d3
 
xqs authored 
315
316
 
      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
      <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
修改客户页面
0c8a451b
 
mahuandong authored 
317
318
 
      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
库区设置编辑
69aa10ad
 
pengcheng authored 
319
320
321
322
 
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
修改客户页面
0c8a451b
 
mahuandong authored 
323
 
    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
初始化分支
db744b72
 
tangying authored 
324
325
 
      <module name="WMSV1" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
修改客户页面
0c8a451b
 
mahuandong authored 
326
 
      <option name="ALTERNATIVE_JRE_PATH" />
初始化分支
db744b72
 
tangying authored 
327
328
329
330
331
 
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
  </component>
maven
81c737f9
 
pengcheng authored 
332
333
334
335
 
  <component name="ServiceViewManager">
    <option name="allServicesViewState">
      <serviceView>
        <treeState>
添加userWarehouse
08918cf7
 
mahuandong authored 
336
 
          <expand />
maven
81c737f9
 
pengcheng authored 
337
338
339
340
341
 
          <select />
        </treeState>
      </serviceView>
    </option>
  </component>
初始化分支
db744b72
 
tangying authored 
342
343
344
345
346
 
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
添加userWarehouse
08918cf7
 
mahuandong authored 
347
 
      <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
修改客户页面
0c8a451b
 
mahuandong authored 
348
 
      <created>1565160110910</created>
初始化分支
db744b72
 
tangying authored 
349
350
 
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
修改客户页面
0c8a451b
 
mahuandong authored 
351
352
353
354
355
356
357
 
      <updated>1565160110910</updated>
      <workItem from="1565160112236" duration="11971000" />
      <workItem from="1565224833241" duration="14642000" />
      <workItem from="1565242153135" duration="1476000" />
      <workItem from="1565259513116" duration="148000" />
      <workItem from="1565311988064" duration="7176000" />
      <workItem from="1565328536669" duration="797000" />
添加userWarehouse
08918cf7
 
mahuandong authored 
358
359
 
      <workItem from="1565345715376" duration="452000" />
      <workItem from="1565570424829" duration="697000" />
初始化分支
db744b72
 
tangying authored 
360
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
361
362
 
    <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
      <created>1565226427512</created>
库区设置编辑
69aa10ad
 
pengcheng authored 
363
364
365
 
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
366
 
      <updated>1565226427512</updated>
库区设置编辑
69aa10ad
 
pengcheng authored 
367
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
368
369
 
    <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
      <created>1565256884822</created>
maven
81c737f9
 
pengcheng authored 
370
371
372
 
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
373
 
      <updated>1565256884822</updated>
maven
81c737f9
 
pengcheng authored 
374
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
375
376
 
    <task id="LOCAL-00003" summary="修改库区service">
      <created>1565259481656</created>
maven
81c737f9
 
pengcheng authored 
377
378
379
 
      <option name="number" value="00003" />
      <option name="presentableId" value="LOCAL-00003" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
380
 
      <updated>1565259481656</updated>
maven
81c737f9
 
pengcheng authored 
381
 
    </task>
Merge branch 'develop' of http:/...
d9319430
 
wangyanxiong authored 
382
383
384
385
386
387
388
389
 
    <task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml">
      <created>1565342188814</created>
      <option name="number" value="00004" />
      <option name="presentableId" value="LOCAL-00004" />
      <option name="project" value="LOCAL" />
      <updated>1565342188814</updated>
    </task>
    <option name="localTasksCounter" value="5" />
初始化分支
db744b72
 
tangying authored 
390
391
 
    <servers />
  </component>
配置文件更新修改
2d5841d3
 
xqs authored 
392
393
394
395
 
  <component name="ToolWindowManager">
    <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
    <editor active="true" />
    <layout>
修复页面字典明细报错
68796bc7
 
xqs authored 
396
397
 
      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4967462" visible="true" weight="0.16897655" />
      <window_info id="Structure" order="1" sideWeight="0.5032538" side_tool="true" weight="0.1673774" />
配置文件更新修改
2d5841d3
 
xqs authored 
398
399
400
401
402
403
404
405
406
 
      <window_info id="Designer" order="2" />
      <window_info id="UI Designer" order="3" />
      <window_info id="Favorites" order="4" side_tool="true" />
      <window_info id="Capture Tool" order="5" />
      <window_info id="Web" order="6" side_tool="true" />
      <window_info id="Image Layers" order="7" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" />
      <window_info anchor="bottom" id="Run" order="2" />
修复页面字典明细报错
68796bc7
 
xqs authored 
407
 
      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.15075922" />
配置文件更新修改
2d5841d3
 
xqs authored 
408
409
410
411
412
413
414
415
 
      <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="bottom" id="Spring" order="7" />
      <window_info anchor="bottom" id="Terminal" order="8" />
      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
      <window_info anchor="bottom" id="Java Enterprise" order="10" />
      <window_info anchor="bottom" id="Database Changes" order="11" />
修复页面字典明细报错
68796bc7
 
xqs authored 
416
 
      <window_info anchor="bottom" id="Version Control" order="12" weight="0.52819955" />
配置文件更新修改
2d5841d3
 
xqs authored 
417
 
      <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
修复页面字典明细报错
68796bc7
 
xqs authored 
418
419
 
      <window_info anchor="bottom" id="Messages" order="14" weight="0.329718" />
      <window_info anchor="bottom" id="MyBatis Log" order="15" />
配置文件更新修改
2d5841d3
 
xqs authored 
420
421
422
 
      <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" />
修复页面字典明细报错
68796bc7
 
xqs authored 
423
 
      <window_info anchor="right" id="Maven" order="3" weight="0.22334754" />
配置文件更新修改
2d5841d3
 
xqs authored 
424
425
 
      <window_info anchor="right" id="Palette" order="4" />
      <window_info anchor="right" id="Capture Analysis" order="5" />
修复页面字典明细报错
68796bc7
 
xqs authored 
426
 
      <window_info anchor="right" id="Database" order="6" weight="0.32995737" />
配置文件更新修改
2d5841d3
 
xqs authored 
427
428
 
      <window_info anchor="right" id="Palette&#9;" order="7" />
      <window_info anchor="right" id="Theme Preview" order="8" />
修复页面字典明细报错
68796bc7
 
xqs authored 
429
 
      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32995737" />
配置文件更新修改
2d5841d3
 
xqs authored 
430
431
 
    </layout>
  </component>
初始化分支
db744b72
 
tangying authored 
432
433
434
 
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
435
436
437
438
439
440
 
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State>
配置文件更新修改
2d5841d3
 
xqs authored 
441
442
443
444
445
446
447
448
449
450
451
452
453
454
 
              <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>
库区设置编辑
69aa10ad
 
pengcheng authored 
455
456
457
458
459
 
            </State>
          </value>
        </entry>
      </map>
    </option>
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
460
461
462
463
464
465
466
467
468
469
470
471
472
473
 
    <option name="RECENT_FILTERS">
      <map>
        <entry key="Branch">
          <value>
            <list />
          </value>
        </entry>
        <entry key="User">
          <value>
            <list />
          </value>
        </entry>
      </map>
    </option>
库区设置编辑
69aa10ad
 
pengcheng authored 
474
475
 
  </component>
  <component name="VcsManagerConfiguration">
修改客户页面
0c8a451b
 
mahuandong authored 
476
477
478
 
    <MESSAGE value="添加库位、库位类型增删改查接口" />
    <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
    <MESSAGE value="修改库区service" />
Merge branch 'develop' of http:/...
d9319430
 
wangyanxiong authored 
479
 
    <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
修复页面字典明细报错
68796bc7
 
xqs authored 
480
481
 
    <MESSAGE value="配置文件更新修改" />
    <option name="LAST_COMMIT_MESSAGE" value="配置文件更新修改" />
maven
81c737f9
 
pengcheng authored 
482
 
  </component>
添加userWarehouse
08918cf7
 
mahuandong authored 
483
484
485
486
487
488
 
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
          <line>78</line>
配置文件更新修改
2d5841d3
 
xqs authored 
489
 
          <properties />
添加userWarehouse
08918cf7
 
mahuandong authored 
490
491
492
493
494
 
          <option name="timeStamp" value="1" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
  </component>
配置文件更新修改
2d5841d3
 
xqs authored 
495
 
  <component name="editorHistoryManager">
修复页面字典明细报错
68796bc7
 
xqs authored 
496
497
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/RedisConfig.java" />
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengServletInitializer.java">
配置文件更新修改
2d5841d3
 
xqs authored 
498
 
      <provider selected="true" editor-type-id="text-editor">
修复页面字典明细报错
68796bc7
 
xqs authored 
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
 
        <state relative-caret-position="180">
          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java" />
    <entry file="file://$PROJECT_DIR$/pom.xml">
      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="6480">
          <caret line="324" column="43" selection-start-line="324" selection-start-column="43" selection-end-line="324" selection-end-column="43" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/service/ExcelReportService.java">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="372">
          <caret line="311" column="16" selection-start-line="311" selection-start-column="16" selection-end-line="311" selection-end-column="16" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
配置文件更新修改
2d5841d3
 
xqs authored 
523
524
525
526
527
 
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
      <provider selected="true" editor-type-id="text-editor">
修复页面字典明细报错
68796bc7
 
xqs authored 
528
 
        <state relative-caret-position="-272">
配置文件更新修改
2d5841d3
 
xqs authored 
529
530
531
532
533
534
535
536
537
538
539
 
          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="40">
          <caret line="2" column="58" selection-start-line="2" selection-start-column="58" selection-end-line="2" selection-end-column="58" />
        </state>
      </provider>
    </entry>
修复页面字典明细报错
68796bc7
 
xqs authored 
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="113">
          <caret line="147" column="39" selection-start-line="147" selection-start-column="39" selection-end-line="147" selection-end-column="39" />
          <folding>
            <element signature="e#3376#3377#0" expanded="true" />
            <element signature="e#3415#3416#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="88">
          <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
配置文件更新修改
2d5841d3
 
xqs authored 
559
 
      <provider selected="true" editor-type-id="text-editor">
修复页面字典明细报错
68796bc7
 
xqs authored 
560
561
 
        <state relative-caret-position="2980">
          <caret line="149" column="10" lean-forward="true" selection-start-line="149" selection-start-column="10" selection-end-line="149" selection-end-column="10" />
配置文件更新修改
2d5841d3
 
xqs authored 
562
563
564
565
 
        </state>
      </provider>
    </entry>
  </component>
初始化分支
db744b72
 
tangying authored 
566
 
</project>