Merge remote-tracking branch 'refs/remotes/origin/huachuang_ls' into feature/20260808/packaging_workshop

Browse Source

# Conflicts:
#	nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/ErrorCodeConstants.java
#	nl-module-task/nl-module-task-api/src/main/java/cn/code/nl/module/task/enums/TaskOwnerServiceEnum.java
#	nl-module-task/nl-module-task-server/src/main/java/cn/code/nl/module/task/mq/producer/TaskEventProducer.java
#	nl-server/src/main/resources/application.yaml

...

This commit is contained in:

liyongde

2026-08-15 14:17:27 +08:00

parent 5ada3c2a41 f95bd84c21

commit 4ccc1e304c

105 changed files with 7447 additions and 107 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

nl-module-wms/nl-module-wms-server/src/main/resources/mapper/bsrealstorattr/BsrealStorAttrMapper.xml → nl-module-wms/nl-module-wms-server/src/main/resources/mapper/bsrealstorattr/BtIvtCutpointivtMapper.xml