From 0126e444e24a22acb1b5909389d7eeba48ba7f6a Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 08 七月 2019 11:42:54 +0800
Subject: [PATCH] rm compare scord
---
es.proto | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/es.proto b/es.proto
index ef13b81..95dc89f 100644
--- a/es.proto
+++ b/es.proto
@@ -11,9 +11,14 @@
string personPicUrl =7;
string phoneNum =8;
string sex =9;
+<<<<<<< HEAD
string idcard = 10;
+=======
+ string idCard = 10;
+>>>>>>> 8cd3a0511c78f1191b642ccd4fa4b1e1ee14c0a4
string monitorLevel = 11;
string content = 12;
+ string picDesc = 13;
}
message Binfos{
--
Gitblit v1.8.0