Merge branch 'dev-ty1.2' into test

# Conflicts: # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
2026-09-14 17:00:41 +08:00
parent 0314d80bca e59173b3f9
commit 29cbf80b7b
55 changed files with 3638 additions and 72 deletions
@@ -35,4 +35,7 @@ public class WarehousePO implements Serializable {

    @Excel(name = "是否启用: 1-否 2-是")
    private Integer isEnable;
+
+    @ApiModelProperty("库存锁定模式: 1-下单冻结 2-分配库存冻结")
+    private Integer stockLockMode;
 }