From db043cb402515837303880cb0948d060e9d76490 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:13:16 +0800
Subject: [PATCH] 整合代码
---
QiaoJiaSystem/VptServer/mainAssist.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/VptServer/mainAssist.h b/QiaoJiaSystem/VptServer/mainAssist.h
index 7f0835f..bf7249d 100644
--- a/QiaoJiaSystem/VptServer/mainAssist.h
+++ b/QiaoJiaSystem/VptServer/mainAssist.h
@@ -90,8 +90,10 @@
//杞﹁締浜屾灞炴�у垎鏋愮粨鏋�
static char colorLabel[14][8] = {"妫�", "姗�", "鐏�", "鐧�", "绮�", "绱�", "绾�", "缁�", "钃�", "閲�", "閾�", "闈�", "榛�", "榛�"};
+static std::string colorLabelStr[14] = {"妫�", "姗�", "鐏�", "鐧�", "绮�", "绱�", "绾�", "缁�", "钃�", "閲�", "閾�", "闈�", "榛�", "榛�"};
enum class ColorLabel {
+ test = -1,
Brown = 0,
Orange,
Gray,
--
Gitblit v1.8.0