From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 08 十二月 2023 11:14:04 +0800
Subject: [PATCH] merge conflicts

---
 constvar/const.go |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/constvar/const.go b/constvar/const.go
index bcbb44c..b8b90e3 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -176,7 +176,7 @@
 	OperationStatus_Waiting                            //姝ｅ湪绛夊緟
 	OperationStatus_Ready                              //灏辩华
 	OperationStatus_Finish                             //瀹屾垚
-	OperationStatus_Cancel                             //瀹屾垚
+	OperationStatus_Cancel                             //鍙栨秷
 )
 
 type PostType int

--
Gitblit v1.8.0