From 1dddba3f0feac87ea67fc90c42c1403020ed6a09 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 19 Mar 2024 13:24:45 +0800 Subject: [PATCH 1/3] rev:gitignore --- wms_pro/hd/{nladmin-system => }/.gitignore | 1 - .../6/e64c9e811d5217de8ee62ae956801ac875abef29 | 0 wms_pro/hd/.idea/sonarlint/issuestore/index.pb | 18 +++++++++++++++--- 3 files changed, 15 insertions(+), 4 deletions(-) rename wms_pro/hd/{nladmin-system => }/.gitignore (92%) delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/e/6/e64c9e811d5217de8ee62ae956801ac875abef29 diff --git a/wms_pro/hd/nladmin-system/.gitignore b/wms_pro/hd/.gitignore similarity index 92% rename from wms_pro/hd/nladmin-system/.gitignore rename to wms_pro/hd/.gitignore index 31c839ba..caa1a2aa 100644 --- a/wms_pro/hd/nladmin-system/.gitignore +++ b/wms_pro/hd/.gitignore @@ -6,4 +6,3 @@ */*.iml /.gradle/ /target/* -.idea/ \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/e/6/e64c9e811d5217de8ee62ae956801ac875abef29 b/wms_pro/hd/.idea/sonarlint/issuestore/e/6/e64c9e811d5217de8ee62ae956801ac875abef29 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb index 9e35f0cf..3eca5484 100644 --- a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb +++ b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb @@ -43,8 +43,6 @@ _nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/M ynladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml,8/5/8579f2942008652ebd59f8eed6fafca608a42516 _ /nladmin-system/src/main/java/org/nl/AppRun.java,1/0/10e40d67bd7d0818c5483704f020703d1bef8378 -I -nladmin-system/.gitignore,e/6/e64c9e811d5217de8ee62ae956801ac875abef29 Œ \nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IBmMaterialService.java,9/6/962216bab28ad31a04e330ae84fc8491b73be9eb ” @@ -124,4 +122,18 @@ jnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/ ” dnladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/impl/BmSupplierServiceImpl.java,4/f/4fc9e6b89767bdae6bb64ea2eb8bdc73585e739c “ -cnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java,7/9/796d922b8f48974be99c1f691627d6ead93d3114 \ No newline at end of file +cnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java,7/9/796d922b8f48974be99c1f691627d6ead93d3114 +  +pnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/mapper/BmClassStandardMapper.java,b/8/b8c90222b0fbaa1656cc1a615e04b9241ec81824 +£ +snladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/mapper/xml/BmClassStandardMapper.xml,3/7/37d758a03ddcd0692bbbe7ae35360dd98d7d5b5f +“ +cnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/BmClassStandard.java,c/3/c3513486b58f2bffcb3f978eee39f1e1b23769d1 +— +gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dto/BmClassStandardTree.java,a/e/ae5dc050d1cb8e346c5d74dfdfbe81380844f770 +— +gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/IBmClassStandardService.java,c/5/c5993a1d750d7041a840a41a573358502883c091 +œ +lnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java,1/6/1682613e5ad252f692c7fe9869e05ba6e993ec0b +Ÿ +onladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java,b/1/b140d08f0cb476ebc6fa39caddd1c7f4819af4c3 \ No newline at end of file From 26c3549775c3e67b0cba7387e8490383e1ed5510 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 19 Mar 2024 13:26:04 +0800 Subject: [PATCH 2/3] Remove .idea directory from version control --- .idea/.gitignore | 5 ----- .idea/codeStyles/codeStyleConfig.xml | 5 ----- .idea/inspectionProfiles/Project_Default.xml | 6 ------ .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ .idea/wms.iml | 12 ------------ 6 files changed, 42 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/wms.iml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index b58b603f..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a17..00000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549e..00000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index ab503c9b..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/wms.iml b/.idea/wms.iml deleted file mode 100644 index 24643cc3..00000000 --- a/.idea/wms.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file From e2555f63498d2e8874ba4200323be32d7de3a4da Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 19 Mar 2024 13:38:41 +0800 Subject: [PATCH 3/3] rev --- .idea/.gitignore | 5 +++++ .idea/codeStyles/codeStyleConfig.xml | 5 +++++ .idea/inspectionProfiles/Project_Default.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ .idea/wms.iml | 12 ++++++++++++ 6 files changed, 42 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/wms.iml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..b58b603f --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..a55e7a17 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..03d9549e --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..ab503c9b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/wms.iml b/.idea/wms.iml new file mode 100644 index 00000000..24643cc3 --- /dev/null +++ b/.idea/wms.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file