From 8f77dea6eb9da8e6172437b3cf17c6a5be712a81 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Fri, 24 Feb 2023 10:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=AD=A6=E6=A0=A1=E8=A6=81?=
 =?UTF-8?q?=E6=B1=82=E6=96=B0=E5=A2=9E=E7=94=9F=E6=BA=90=E5=9C=B0=E3=80=81?=
 =?UTF-8?q?=E6=AF=95=E4=B8=9A=E5=AD=A6=E6=A0=A1=E3=80=81=E7=8E=B0=E5=AE=B6?=
 =?UTF-8?q?=E5=BA=AD=E4=BD=8F=E5=9D=80=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/Form.cshtml                 | 14 +++++++++-----
 .../XmlConfig/database.config                      |  4 ++--
 .../StuInfoBasic/StuInfoBasicEntity.cs             |  7 +++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml
index 8e0672fee..ac0baae3e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml	
@@ -67,10 +67,14 @@
         <div class="lr-form-item-title">出生日期<font face="宋体">*</font></div>
         <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    @*<div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">学生来源</div>
-        <div id="StuOrigin" isvalid="yes"></div>
-    </div>*@
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">生源地</div>
+        <input id="StuOrigin" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">毕业学校</div>
+        <input id="GraduateSchool" type="text" class="form-control" />
+    </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">招生对象</div>
         <div id="RecruitObject" isvalid="yes"></div>
@@ -136,7 +140,7 @@
         <input id="QQ" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">家庭地址<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">家庭住址<font face="宋体">*</font></div>
         <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index c5c724312..cb62a433b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
@@ -16,8 +16,8 @@
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_长阳;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_长阳;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_新疆司法;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_新疆司法;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 
   <!--<add name="BaseDb" connectionString="Server=39.97.168.125;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
index bb9da95e2..5c1cba26f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs	
@@ -914,6 +914,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         [Column("DIPLOMARECEIVEREMARK")]
         public string DiplomaReceiveRemark { get; set; }
+
+        /// <summary>
+        /// 毕业学校
+        /// </summary>
+        [Column("GRADUATESCHOOL")]
+        public string GraduateSchool { get; set; }
+
         #endregion
 
         #region  扩展操作