From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Services/UserService.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index 8bde3cc..9e13482 100644
--- a/zhengcaioa/Services/UserService.cs
+++ b/zhengcaioa/Services/UserService.cs
@@ -189,6 +189,7 @@
updatepltUser.jibensalary = pltUser.jibensalary;
updatepltUser.jintiesalary = pltUser.jintiesalary;
updatepltUser.geshuiqizheng = pltUser.geshuiqizheng;
+ updatepltUser.Yaoqingma = pltUser.Yaoqingma;
}
_context.SaveChanges();
@@ -335,7 +336,7 @@
jintiesalaryName = a.jintiesalary.HasValue ? a.jintiesalary.Value.ToString("F2") : "",
geshuiqizheng = a.geshuiqizheng,
geshuiqizhengName = a.geshuiqizheng.HasValue ? a.geshuiqizheng.Value.ToString("F2") : "",
-
+ Yaoqingma = a.Yaoqingma,
}
).OrderBy(x => x.Usernumber).ToList();
--
Gitblit v1.9.1