Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

# Conflicts: # klp-admin/src/main/resources/application-prod.yml
2026-05-23 19:35:22 +08:00
parent 35ad50a79d af6eb19952
commit cd099f2e6b
85 changed files with 11908 additions and 843 deletions
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java
@@ -82,4 +82,6 @@ public class WmsTransferOrderItemBo extends BaseEntity {
    // 修改之后的itemType
    private String itemTypeAfter;

+    // 重贴标签的备注
+    private String transferRemark;
 }