From 9618bd891ff9aae0d1fb7620ce90fbfd3b63a66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Fri, 16 Sep 2022 19:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E6=80=A7?=
 =?UTF-8?q?=E5=88=AB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebFirst/database/sqlite.db                   | Bin 634880 -> 634880 bytes
 .../yi-sqlsugar-dev.db                        | Bin 151552 -> 151552 bytes
 .../ModelsTemplate/UserEntity.cs              |   5 +++++
 .../src/views/system/user/index.vue           |   3 +--
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WebFirst/database/sqlite.db b/WebFirst/database/sqlite.db
index 6f908b4c7c286324f7bf7bbb5de2179fa33c0183..7b57d339f00c70a869e3f7b1372727180ce11caf 100644
GIT binary patch
delta 167
zcmZp8pw{p}ZGw~#Ga~~7!)zdif!>KaMoi3%8xu_Q8N-^V>bFnTXWTwjpUIj@z)Zo=
z(#p`l%E(C1)XdnzWOBg^jqMypOn+n<ZKksZFjX>f9N6qAaEN8QQz%mnvjQuFbXyoV
zgRn3M2Zy9EBSUa%1rR-JSpKwQb!J|PP5ZqFCLm@8Viq7~1!6WJW(Q)9?e`)$mBIlN
C=P|?p

delta 165
zcmZp8pw{p}ZGw~#(;o%~hS@+21KksKjF_1IY)mlGXAEtgs^30UpK<$CeI{!rL1P6&
zGb>{QD??K~149dA6Vu6wPc^o48ZrHrWwf5o8o*S!*-_vK%XX(wrW$4iWd>1E4h{}k
zQAUP<{NfT2e!6M;lfAu}DLMIh>0a&kBA9@f8Hibcm=%cGfS4VKIkw-6;8Y3+02F~V
AjQ{`u

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index e3211c5fe3759b5d3decc383ffec6a3f8252c8d4..f7907dacfe3bb8825e1dfcb6ee3e7755d570a12a 100644
GIT binary patch
delta 202
zcmZozz}c{XbApr*6B7digDMcifc-=rBPJ%MjR|Y`nYdSO<`b~vW@3n+>?a*9(-_4p
z$;QCQV9emm!64pfY0DtVz#ys2z{$YCIoVNORme=i(9+7#+{(yQ&)m?|(Ady)a)o>Y
zm$8MBB@hG2$!#)^nE2H<XUXnmWC7ZEvsqhyyS6;zJp;zZ?OXwjQ7r5V;-aFA9oZA-
qiE*{WF|vbro$?#!?PQ$pAI3O|TSp-wIJF`{Av3RJ`@=9s`JVuwc`jT4

delta 229
zcmZozz}c{XbApr*<39!l22~)20lSGhMof(VHYTj$XX01i%qL*S&BSOk*-tt;zSt`w
zxXRHv-yp2Spd{SWqbSPUF(N&vG@~Li%Dgx~G|@EKr_{U5R5vBp!_Ua2LboD4I3*`2
zBBUrW$jjH%)IZnXH6pwqH!#t&AjKd&E7#pE)FQjgIWRpbJ3v2u@*+6{Mx)8M<a{T$
z$vk3WVAz}`yO)urF^pNfSzCU)wmjoK1IC{1Tmg(xEbQ9iqN0o)*%Rj}a<v3AvV(Y?
VoEzuuWSs62#yDyF!!Snqp8!vzM27$X

diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs
index 95f35eb0..70d7731f 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs
@@ -123,5 +123,10 @@ namespace Yi.Framework.Model.Models
         ///</summary>
          [SugarColumn(ColumnName="DeptId"    )]
          public long? DeptId { get; set; }
+        /// <summary>
+        /// 性别 
+        ///</summary>
+         [SugarColumn(ColumnName="Sex"    )]
+         public int? Sex { get; set; }
     }
 }
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
index 89ad5b23..74636c8f 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
@@ -158,8 +158,7 @@
                <el-col :span="12">
                   <el-form-item label="用户性别">
                      <el-select v-model="form.user.sex" placeholder="请选择">
-                        <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
-                           :value="dict.value"></el-option>
+                        <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="JSON.parse(dict.value) "></el-option>
                      </el-select>
                   </el-form-item>
                </el-col>