From dbd24bba414ddd597df94f41a2fffc52cd04dccd Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Fri, 25 Feb 2022 11:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BF=A1=E6=81=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E7=9C=81=E7=BC=96=E5=AD=A6=E5=8F=B7=20=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=AD=A6=E5=8F=B7=20=E5=AD=A6=E5=8F=B7=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=AD=A6=E7=94=9F=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EducationalAdministration/Views/StuInfoBasic/Form.cshtml  | 4 ++--
 .../Views/StuInfoBasic/FormTran.cshtml                        | 4 ++--
 .../EducationalAdministration/Views/StuInfoBasic/Index.js     | 4 ++--
 .../EducationalAdministration/Views/StuVolunteer/Form.cshtml  | 2 +-
 .../EducationalAdministration/Views/StuVolunteer/Index.js     | 2 +-
 .../Learun.Application.Web/Learun.Application.Web.csproj      | 2 --
 .../StuInfoBasic/StuInfoBasicEntity.cs                        | 2 +-
 .../StuVolunteer/StuVolunteerEntity.cs                        | 2 +-
 8 files changed, 10 insertions(+), 12 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 5da3371aa..0ae5e5575 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	
@@ -8,7 +8,7 @@
         <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 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="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
@@ -24,7 +24,7 @@
         <input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">省编学号</div>
+        <div class="lr-form-item-title">学号</div>
         <input id="ProvinceCode" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml
index 94992ced8..56e8d5d39 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml	
@@ -8,7 +8,7 @@
         <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 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="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
@@ -24,7 +24,7 @@
         <input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">省编学号</div>
+        <div class="lr-form-item-title">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index 6b5e36cd1..bb9f8db8e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
@@ -292,9 +292,9 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "学生编号", name: "StuNo", width: 100, align: "left" },
                     { label: "学籍号", name: "StuCode", width: 100, align: "left" },
-                    { label: "省编学号", name: "ProvinceCode", width: 100, align: "left" },
+                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml
index 3b80e7016..9f35288d4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml	
@@ -20,7 +20,7 @@
         <input id="ApplyNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
-        <div class="lr-form-item-title">省编学号</div>
+        <div class="lr-form-item-title">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js
index b104dc76b..4abe7fb24 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js	
@@ -81,7 +81,7 @@ var bootstrap = function ($, learun) {
                     { label: "初中毕业学校", name: "BySchool", width: 150, align: "left" },
                     { label: "初中学号", name: "H_SchoolNo", width: 150, align: "left" },
                     { label: "中考报名号", name: "ApplyNo", width: 150, align: "left" },
-                    { label: "省编学号", name: "ProvinceCode", width: 150, align: "left" },
+                    { label: "学号", name: "ProvinceCode", width: 150, align: "left" },
                     { label: "学生姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "Sex", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 215a79797..f166d720c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -1171,7 +1171,6 @@
     <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\IndexManage.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormView.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\IndexResult.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\SubmitIndex.js" />
@@ -6643,7 +6642,6 @@
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />
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 ef501ae3f..d8a0d5ad7 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	
@@ -709,7 +709,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("TWOPOSITION")]
         public string TwoPosition { get; set; }
         /// <summary>
-        /// 省编学号
+        /// 学号
         /// </summary>
         [Column("PROVINCECODE")]
         public string ProvinceCode { get; set; }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
index cbac5004a..cb8fad77f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs	
@@ -252,7 +252,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         public string LinkPhone { get; set; }
         /// <summary>
-        /// 省编学号
+        /// 学号
         /// </summary>
         [Column("PROVINCECODE")]
         public string ProvinceCode { get; set; }