zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
chenbowen
2026-01-15 11:29:57 +08:00
parent b2e56f1c7f 34205bc1a6
commit a279414aef
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscDatBsnSaveReqVO.java → zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscDatBsnSaveReqVO.java
View File

@@ -1,9 +1,7 @@
package com.zt.plat.module.base.controller.admin.templtp.vo;
import com.alibaba.fastjson2.JSONArray;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 业务实例字段值新增/修改 Request VO")

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscItmBsnSaveReqVO.java → zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscItmBsnSaveReqVO.java
View File

@@ -2,7 +2,6 @@ package com.zt.plat.module.base.controller.admin.templtp.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 业务实例条款值新增/修改 Request VO")

3
zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java
View File

@@ -57,6 +57,9 @@ public interface ErrorCodeConstants {
ErrorCode MATERIAL_CLASSES_LEVEL_CONFLICT_WITH_CHILDREN = new ErrorCode(1_027_101_104, "存在下级分类，无法调整当前分类层级");
ErrorCode MATERIAL_CLASSES_LEVEL3_REQUIRED_FOR_MATERIAL = new ErrorCode(1_027_101_105, "仅允许三级物料分类关联物料");
// ========== 物料牌号扩展 ==========
ErrorCode MATERIAL_GRADE_EXT_NOT_EXISTS = new ErrorCode(1_027_101_201, "物料牌号扩展不存在");
// ========== 工艺信息属性 ==========
ErrorCode PROCESSING_INFOMATION_NOT_EXISTS = new ErrorCode(1_027_101_005, "工艺信息不存在");
ErrorCode PROCESSING_INFOMATION_OPERATION_NOT_EXISTS = new ErrorCode(1_027_101_006, "工艺工序不存在");

6
zt-module-contract-order/zt-module-contract-order-api/pom.xml
View File

@@ -41,12 +41,6 @@
<artifactId>spring-cloud-starter-openfeign</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>zt-module-base-server</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>