From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java
index 0b27e26..5aef891 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java
@@ -13,9 +13,9 @@
@AllArgsConstructor
public enum ProcessCategoryEnum {
CATEGORY0(0, "错误分类"),
- CATEGORY1(1, "入户调查"),
- CATEGORY2(2, "价格评估"),
- CATEGORY3(3, "协议签订"),
+ CATEGORY1(1, "合同新增审批"),
+ CATEGORY2(2, "合同签订审批"),
+ CATEGORY3(3, "合同提前终止审批"),
;
--
Gitblit v1.7.1