Merge branch 'v2020collect' into v2020dongfang

# Conflicts:
#	performance/Performance.Services/ComputeService.cs
#	performance/Performance.Services/SecondAllotService.cs

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -3625,6 +3625,11 @@
         </member>
         <member name="P:Performance.EntityModels.per_employee.PersonnelNumber">
             <summary>
+            员工工号（HIS）
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.per_employee.JobNumber">
+            <summary>
             员工工号
             </summary>
         </member>

performance/Performance.EntityModels/Entity/per_employee.cs

@@ -52,6 +52,11 @@ public class per_employee
         public string PersonnelNumber { get; set; }
 
         /// <summary>
+        /// 员工工号（HIS）
+        /// </summary>
+        public string JobNumber { get; set; }
+
+        /// <summary>
         /// 正式/临聘
         /// </summary>
         public string JobCategory { get; set; }

performance/Performance.Extract.Api/appsettings.Development.json

@@ -10,6 +10,7 @@
   //连接字符串
   "AppConnection": {
     "PerformanceConnectionString": "server=192.168.18.166;database=db_performance;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     //"PerformanceConnectionString": "server=116.62.245.55;database=db_performance;uid=bigdata;pwd=Suvalue@abc;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"