Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config

@@ -30,5 +30,5 @@
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-
+<!--测试公共提交-->
 </connectionStrings>

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -134,7 +134,7 @@
   <!-- 深信服ACIp -->
   <add key="ACIp" value="192.168.90.2"/>
   <add key="ACIp2" value="192.168.200.252"/>
-  <!-- 是否强制验证强密码444 -->
+  <!-- 是否强制验证强密码 -->
   <add key="verifypwd" value="false"/>
   <!--疫情防控组角色Id-->
   <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />