Blame view

.idea/workspace.xml 25.8 KB
tangying authored
1
2
3
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ChangeListManager">
mahuandong authored
4
    <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
5
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/config/MybatisPlusConfig.java" afterDir="false" />
pengcheng authored
6
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7
8
9
10
11
12
13
14
15
16
17
18
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" afterDir="false" />
tangying authored
19
20
21
22
23
24
25
    </list>
    <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>
pengcheng authored
26
  <component name="DatabaseView">
mahuandong authored
27
    <option name="SHOW_INTERMEDIATE" value="false" />
pengcheng authored
28
29
30
31
32
    <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" />
mahuandong authored
33
    <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
pengcheng authored
34
35
36
37
38
39
    <option name="HIDDEN_KINDS">
      <set />
    </option>
    <expand>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
mahuandong authored
40
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
pengcheng authored
41
42
43
      </path>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
mahuandong authored
44
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
pengcheng authored
45
46
47
48
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
      </path>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
mahuandong authored
49
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
pengcheng authored
50
51
52
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
      </path>
mahuandong authored
53
54
55
56
57
58
59
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
        <item name="location: table" type="285a2a93:MysqlImplModel$Table" />
      </path>
pengcheng authored
60
61
62
    </expand>
    <select />
  </component>
wangyanxiong authored
63
64
65
66
67
68
69
70
71
72
73
74
75
76
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="70">
              <caret line="124" column="57" selection-start-line="124" selection-start-column="38" selection-end-line="124" selection-end-column="57" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/edit.html">
          <provider selected="true" editor-type-id="text-editor">
77
78
            <state relative-caret-position="171">
              <caret line="69" column="65" lean-forward="true" selection-start-line="69" selection-start-column="65" selection-end-line="69" selection-end-column="65" />
wangyanxiong authored
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="193">
              <caret line="87" column="77" selection-start-line="87" selection-start-column="61" selection-end-line="87" selection-end-column="77" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/add.html">
          <provider selected="true" editor-type-id="text-editor" />
        </entry>
      </file>
    </leaf>
  </component>
pengcheng authored
99
100
101
102
103
104
105
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
        <option value="Class" />
      </list>
    </option>
  </component>
tangying authored
106
  <component name="Git.Settings">
wangyanxiong authored
107
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
pengcheng authored
108
109
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
mahuandong authored
110
        <entry key="$PROJECT_DIR$" value="master" />
pengcheng authored
111
112
      </map>
    </option>
wangyanxiong authored
113
  </component>
pengcheng authored
114
115
116
  <component name="IgnoredFileRootStore">
    <option name="generatedRoots">
      <set>
mahuandong authored
117
        <option value="E:\code\wms2\.idea" />
pengcheng authored
118
119
120
      </set>
    </option>
  </component>
121
122
123
124
125
  <component name="ProjectFrameBounds" extendedState="6">
    <option name="x" value="470" />
    <option name="width" value="980" />
    <option name="height" value="1030" />
  </component>
mahuandong authored
126
127
128
  <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
  <component name="ProjectLevelVcsManager">
    <ConfirmationsSetting value="2" id="Add" />
tangying authored
129
  </component>
wangyanxiong authored
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
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
215
216
217
218
219
220
221
222
223
224
225
226
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
265
266
267
268
269
270
271
272
273
274
275
276
277
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="PackagesPane" />
      <pane id="Scope" />
      <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" />
              <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" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" 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="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="system" type="462c0819:PsiDirectoryNode" />
              <item name="user" 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" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="system" type="462c0819:PsiDirectoryNode" />
              <item name="user" type="462c0819:PsiDirectoryNode" />
              <item name="controller" 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" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="system" type="462c0819:PsiDirectoryNode" />
              <item name="user" type="462c0819:PsiDirectoryNode" />
              <item name="domain" 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" />
            </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" />
            </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="user" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
    </panes>
  </component>
tangying authored
278
  <component name="PropertiesComponent">
mahuandong authored
279
    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
pengcheng authored
280
    <property name="DatabaseDriversLRU" value="mysql" />
pengcheng authored
281
282
283
284
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
tangying authored
285
286
287
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
mahuandong authored
288
289
290
291
292
293
294
    <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)" />
pengcheng authored
295
    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
tangying authored
296
  </component>
pengcheng authored
297
  <component name="RecentsManager">
mahuandong authored
298
299
300
    <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" />
pengcheng authored
301
302
    </key>
  </component>
tangying authored
303
304
305
306
307
308
309
310
311
312
313
314
  <component name="RunDashboard">
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
  </component>
315
  <component name="RunManager">
mahuandong authored
316
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
pengcheng authored
317
      <module name="WMSV1" />
mahuandong authored
318
319
320
321
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
      <option name="ALTERNATIVE_JRE_PATH" />
      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
pengcheng authored
322
323
324
325
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
mahuandong authored
326
    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
tangying authored
327
328
      <module name="WMSV1" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
mahuandong authored
329
      <option name="ALTERNATIVE_JRE_PATH" />
tangying authored
330
331
332
333
334
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
  </component>
pengcheng authored
335
336
337
338
339
340
341
  <component name="ServiceViewManager">
    <option name="allServicesViewState">
      <serviceView>
        <treeState>
          <expand>
            <path>
              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
mahuandong authored
342
              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
pengcheng authored
343
344
345
346
347
348
349
            </path>
          </expand>
          <select />
        </treeState>
      </serviceView>
    </option>
  </component>
tangying authored
350
351
352
353
354
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
mahuandong authored
355
356
      <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
      <created>1565160110910</created>
tangying authored
357
358
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
mahuandong authored
359
360
361
362
363
364
365
      <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" />
tangying authored
366
    </task>
mahuandong authored
367
368
    <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
      <created>1565226427512</created>
pengcheng authored
369
370
371
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
mahuandong authored
372
      <updated>1565226427512</updated>
pengcheng authored
373
    </task>
mahuandong authored
374
375
    <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
      <created>1565256884822</created>
pengcheng authored
376
377
378
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
mahuandong authored
379
      <updated>1565256884822</updated>
pengcheng authored
380
    </task>
mahuandong authored
381
382
    <task id="LOCAL-00003" summary="修改库区service">
      <created>1565259481656</created>
pengcheng authored
383
384
385
      <option name="number" value="00003" />
      <option name="presentableId" value="LOCAL-00003" />
      <option name="project" value="LOCAL" />
mahuandong authored
386
      <updated>1565259481656</updated>
pengcheng authored
387
    </task>
388
389
390
391
392
393
394
395
    <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" />
tangying authored
396
397
    <servers />
  </component>
wangyanxiong authored
398
  <component name="TimeTrackingManager">
399
    <option name="totallyTimeSpent" value="893000" />
wangyanxiong authored
400
401
402
  </component>
  <component name="ToolWindowManager">
    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
403
    <editor active="true" />
wangyanxiong authored
404
    <layout>
405
      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2533512" />
wangyanxiong authored
406
407
408
409
410
411
412
413
414
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info id="Designer" order="2" />
      <window_info id="Image Layers" order="3" />
      <window_info id="Capture Tool" order="4" />
      <window_info id="UI Designer" order="5" />
      <window_info id="Favorites" order="6" side_tool="true" />
      <window_info id="Web" order="7" side_tool="true" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" />
415
      <window_info anchor="bottom" id="Run" order="2" weight="0.25212464" />
wangyanxiong authored
416
417
418
419
420
421
422
423
424
425
426
      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
      <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" weight="0.3286119" />
      <window_info anchor="bottom" id="Spring" order="7" weight="0.3286119" />
      <window_info anchor="bottom" id="Terminal" order="8" weight="0.3286119" />
      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
      <window_info anchor="bottom" id="Messages" order="11" />
      <window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.3286119" />
      <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" />
427
      <window_info active="true" anchor="bottom" id="Version Control" order="14" visible="true" weight="0.42351276" />
wangyanxiong authored
428
429
430
431
432
433
434
435
436
437
438
439
      <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" />
      <window_info anchor="right" id="Maven" order="3" weight="0.3297587" />
      <window_info anchor="right" id="Palette" order="4" />
      <window_info anchor="right" id="Capture Analysis" order="5" />
      <window_info anchor="right" id="Database" order="6" />
      <window_info anchor="right" id="Palette&#9;" order="7" />
      <window_info anchor="right" id="Theme Preview" order="8" />
      <window_info anchor="right" id="Bean Validation" order="9" />
    </layout>
  </component>
tangying authored
440
441
442
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
pengcheng authored
443
444
445
446
447
448
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State>
wangyanxiong authored
449
450
451
452
453
454
              <option name="RECENTLY_FILTERED_USER_GROUPS">
                <collection />
              </option>
              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
                <collection />
              </option>
455
              <option name="COLUMN_ORDER" />
pengcheng authored
456
457
458
459
460
            </State>
          </value>
        </entry>
      </map>
    </option>
wangyanxiong authored
461
462
463
464
465
466
467
468
469
470
471
472
473
474
    <option name="RECENT_FILTERS">
      <map>
        <entry key="Branch">
          <value>
            <list />
          </value>
        </entry>
        <entry key="User">
          <value>
            <list />
          </value>
        </entry>
      </map>
    </option>
pengcheng authored
475
476
  </component>
  <component name="VcsManagerConfiguration">
mahuandong authored
477
478
479
    <MESSAGE value="添加库位、库位类型增删改查接口" />
    <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
    <MESSAGE value="修改库区service" />
480
481
    <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
    <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
pengcheng authored
482
  </component>
tangying authored
483
</project>