<?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="合并信义源码"> <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/Shipment.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/application-prd.yml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/fonts/STSONG.TTF" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/fonts/fonts.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/jaspers/mypage.jasper" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/check/CheckDetailMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/check/CheckHeaderMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/check/CheckingRegisterMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/AlarmLevelMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/BomHeaderMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/CarrierMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ConfigValueMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ConfigWarningMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerCapacityMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/CustomerMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ExcelTemplateMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/FilterConfigDetailMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialMultipleMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialTypeMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ReceiptPreferenceMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ReceiptTypeMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/SendMailMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/StationMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/StatusFlowDetailMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/SupplierMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/WarehouseMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/WaveFlowDetailMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/WcsscanbarcodeMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/AdjustDetailMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/monitor/JobLogMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/monitor/JobMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptDetailHistoryMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptHeaderHistoryMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentCombinationMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentDetailHistoryMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentHeaderHistoryMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/WaveMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/system/SysUserWarehouseMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskPreferenceMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/xinyi/TokenMapper.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap3-editable/img/loading.gif" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap3-editable/js/bootstrap-editable.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap3-editable/js/bootstrap-editable.min.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/alarmLevel/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/alarmLevel/alarmLevel.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/alarmLevel/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/bomDetail.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/bomHeader.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/carrier/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/carrier/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/company/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/company/company.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/company/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configValue/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configValue/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configWarning/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configWarning/configWarning.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configWarning/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/container.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/customer/customer.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/customer/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/cycleCountPreference/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/excelTemplate/excelTemplate.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigDetail/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigDetail/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/addBatch.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/materialMultiple.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialType/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialType/materialType.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/materialUnit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/receiptType.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentPreference/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentPreference/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/shipmentType.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowDetail/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowDetail/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowDetail/statusFlowDetail.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/supplier/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/copy.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/waveFlowHeader.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveMaster/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveMaster/waveMaster.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/report.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyContainer.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/shipmentAnalyzeTemplate.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/addWave.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/wave/add.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/wave/edit.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/BatchCreated.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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/utils/http/HttpUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/http/HttpUtils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/CompanyInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/CompanyInfo.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/MobileUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/MobileUserController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventory.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/ReceiptBill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/ReceiptBill.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/domain/Location.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/domain/Location.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/mapper/WcsscanbarcodeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/mapper/WcsscanbarcodeMapper.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/service/WcsscanbarcodeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/service/WcsscanbarcodeService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/domain/Dept.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/domain/Dept.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/application-druid.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-druid.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/monitor/locationstatus/locationstatus.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/monitor/locationstatus/locationstatus.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/edit.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/add.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/edit.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/dept/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/dept/add.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/dept/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/dept/edit.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/menu/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/menu/add.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/user/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/user/add.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/test/java/com.huaheng.test/EncryptPassword.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/EncryptPassword.java" afterDir="false" /> </list> <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="DatabaseView"> <option name="SHOW_INTERMEDIATE" value="false" /> <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" /> <option name="AUTO_SCROLL_FROM_SOURCE" value="true" /> <option name="HIDDEN_KINDS"> <set /> </option> <expand> <path> <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> </path> <path> <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> </path> <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" /> </path> <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> </expand> <select /> </component> <component name="FileTemplateManagerImpl"> <option name="RECENT_TEMPLATES"> <list> <option value="Interface" /> <option value="Enum" /> <option value="HTML File" /> <option value="Class" /> </list> </option> </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_BRANCH_BY_REPOSITORY"> <map> <entry key="$PROJECT_DIR$" value="master" /> </map> </option> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="UPDATE_TYPE" value="MERGE" /> </component> <component name="IgnoredFileRootStore"> <option name="generatedRoots"> <set> <option value="E:\code\wms2\.idea" /> </set> </option> </component> <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" /> <component name="ProjectLevelVcsManager"> <ConfirmationsSetting value="2" id="Add" /> </component> <component name="ProjectViewState"> <option name="hideEmptyMiddlePackages" value="true" /> <option name="showExcludedFiles" value="true" /> <option name="showLibraryContents" value="true" /> </component> <component name="PropertiesComponent"> <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> <property name="DatabaseDriversLRU" value="mysql" /> <property name="ExpandSpringBootJavaOptionsPanel" value="true" /> <property name="RequestMappingsPanelOrder0" value="0" /> <property name="RequestMappingsPanelOrder1" value="1" /> <property name="RequestMappingsPanelWidth0" value="75" /> <property name="RequestMappingsPanelWidth1" value="75" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> <property name="ignore_missing_gitignore" value="true" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader" /> <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)" /> <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> </component> <component name="RecentsManager"> <key name="CopyFile.RECENT_KEYS"> <recent name="E:\code\wms2\src\main\resources\templates\task\taskHeader" /> <recent name="E:\code\wms2\src\main\resources\mybatis\monitor" /> </key> <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" /> </key> </component> <component name="RunManager"> <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <module name="wms2" /> <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" /> <method v="2"> <option name="Make" enabled="true" /> </method> </configuration> <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> <module name="huaheng" /> <extension name="coverage"> <pattern> <option name="PATTERN" value="com.huaheng.*" /> <option name="ENABLED" value="true" /> </pattern> </extension> <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> <option name="ALTERNATIVE_JRE_PATH" /> <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateResources" /> <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> </configuration> </component> <component name="ServiceViewManager"> <option name="viewStates"> <list> <serviceView> <treeState> <expand /> <select /> </treeState> </serviceView> </list> </option> </component> <component name="SvnConfiguration"> <configuration /> </component> <component name="TaskManager"> <task active="true" id="Default" summary="Default task"> <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" /> <created>1565160110910</created> <option name="number" value="Default" /> <option name="presentableId" value="Default" /> <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" /> <workItem from="1578550781950" duration="1941000" /> <workItem from="1578571901482" duration="717000" /> <workItem from="1580799270581" duration="22000" /> <workItem from="1580799464519" duration="19000" /> <workItem from="1581986427727" duration="2807000" /> <workItem from="1581990347840" duration="909000" /> </task> <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> <created>1565226427512</created> <option name="number" value="00001" /> <option name="presentableId" value="LOCAL-00001" /> <option name="project" value="LOCAL" /> <updated>1565226427512</updated> </task> <task id="LOCAL-00002" summary="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面"> <created>1565256884822</created> <option name="number" value="00002" /> <option name="presentableId" value="LOCAL-00002" /> <option name="project" value="LOCAL" /> <updated>1565256884822</updated> </task> <task id="LOCAL-00003" summary="修改库区service"> <created>1565259481656</created> <option name="number" value="00003" /> <option name="presentableId" value="LOCAL-00003" /> <option name="project" value="LOCAL" /> <updated>1565259481656</updated> </task> <option name="localTasksCounter" value="5" /> <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="1" /> </component> <component name="Vcs.Log.Tabs.Properties"> <option name="TAB_STATES"> <map> <entry key="MAIN"> <value> <State> <option name="COLUMN_ORDER" /> </State> </value> </entry> </map> </option> </component> <component name="VcsManagerConfiguration"> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <MESSAGE value="添加库位、库位类型增删改查接口" /> <MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" /> <MESSAGE value="修改库区service" /> <option name="LAST_COMMIT_MESSAGE" value="合并信义源码" /> </component> <component name="WindowStateProjectService"> <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1581988248941"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581988248941" /> <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1581987412294"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581987412294" /> <state x="550" y="111" key="CommitChangelistDialog2" timestamp="1581991431575"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="550" y="111" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991431575" /> <state x="550" y="111" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1578572128713" /> <state x="184" y="92" key="DiffContextDialog" timestamp="1578572140549"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="184" y="92" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1578572140549" /> <state width="1877" height="232" key="GridCell.Tab.0.bottom" timestamp="1581991356919"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" /> <state width="1877" height="232" key="GridCell.Tab.0.center" timestamp="1581991356919"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" /> <state width="1877" height="232" key="GridCell.Tab.0.left" timestamp="1581991356919"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" /> <state width="1877" height="232" key="GridCell.Tab.0.right" timestamp="1581991356919"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" /> <state width="1877" height="232" key="GridCell.Tab.1.bottom" timestamp="1581991356846"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" /> <state width="1877" height="232" key="GridCell.Tab.1.center" timestamp="1581991356846"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" /> <state width="1877" height="232" key="GridCell.Tab.1.left" timestamp="1581991356846"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" /> <state width="1877" height="232" key="GridCell.Tab.1.right" timestamp="1581991356846"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" /> <state width="1877" height="232" key="GridCell.Tab.2.bottom" timestamp="1581991356846"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.2.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" /> <state width="1877" height="232" key="GridCell.Tab.2.center" timestamp="1581991356846"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.2.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" /> <state width="1877" height="232" key="GridCell.Tab.2.left" timestamp="1581991356846"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.2.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" /> <state width="1877" height="232" key="GridCell.Tab.2.right" timestamp="1581991356846"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state width="1877" height="232" key="GridCell.Tab.2.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" /> <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1578572617942"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1578572617942" /> <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1581986457286"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581986457286" /> <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog" timestamp="1581987510895"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581987510895" /> <state x="647" y="310" key="git4idea.merge.GitPullDialog" timestamp="1578572305258"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="647" y="310" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1578572305258" /> <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1581987109995"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581987109995" /> </component> </project>