r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 处理冲突

This commit is contained in:
YuanFeng 2024-08-12 01:11:38 +08:00
parent 5b73c0cd01
commit 5744f7be34
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
View File

@ -7,11 +7,6 @@ public interface ErrorCodeConstants extends cn.hangtag.module.system.enums.Erro
// ========== 产品资料 TODO 补充编号 ==========
ErrorCode PRODUCT_INFO_NOT_EXISTS = new ErrorCode(3200, "产品资料 不存在");
ErrorCode CUSTOMER_NOT_EXISTS = new ErrorCode(3300, "客户不存在");
ErrorCode SHAPE_TEMPLATE_NOT_EXISTS = new ErrorCode(3200, "图形模板管理 不存在");<<<<<<< .mine
ErrorCode SHAPE_TEMPLATE_NOT_EXISTS = new ErrorCode(3200, "图形模板管理 不存在");
ErrorCode SHAPE_TEMPLATE_NOT_EXISTS = new ErrorCode(3200, "图形模板管理 不存在");
=======
ErrorCode CUSTOMER_NOT_EXISTS = new ErrorCode(3300, "客户不存在");
>>>>>>> .theirs
}