Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhangzq
2024-03-20 15:04:31 +08:00
3 changed files with 15 additions and 4 deletions

View File

@@ -6,4 +6,3 @@
*/*.iml
/.gradle/
/target/*
.idea/

View File

@@ -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
<EFBFBD>
\nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IBmMaterialService.java,9/6/962216bab28ad31a04e330ae84fc8491b73be9eb
<EFBFBD>
@@ -124,4 +122,18 @@ jnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/
<EFBFBD>
dnladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/impl/BmSupplierServiceImpl.java,4/f/4fc9e6b89767bdae6bb64ea2eb8bdc73585e739c
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java,7/9/796d922b8f48974be99c1f691627d6ead93d3114
cnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java,7/9/796d922b8f48974be99c1f691627d6ead93d3114
<EFBFBD>
pnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/mapper/BmClassStandardMapper.java,b/8/b8c90222b0fbaa1656cc1a615e04b9241ec81824
<EFBFBD>
snladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/mapper/xml/BmClassStandardMapper.xml,3/7/37d758a03ddcd0692bbbe7ae35360dd98d7d5b5f
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/BmClassStandard.java,c/3/c3513486b58f2bffcb3f978eee39f1e1b23769d1
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dto/BmClassStandardTree.java,a/e/ae5dc050d1cb8e346c5d74dfdfbe81380844f770
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/IBmClassStandardService.java,c/5/c5993a1d750d7041a840a41a573358502883c091
<EFBFBD>
lnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java,1/6/1682613e5ad252f692c7fe9869e05ba6e993ec0b
<EFBFBD>
onladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java,b/1/b140d08f0cb476ebc6fa39caddd1c7f4819af4c3