From 82954f31a43d8f6c2c76b24bf09fd45502c24638 Mon Sep 17 00:00:00 2001 From: hzj <1831054011@qq.com> Date: 星期一, 13 十月 2025 15:34:18 +0800 Subject: [PATCH] 解决合并冲突 --- AdminUser.gds | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/AdminUser.gds b/AdminUser.gds index 8dc571b..dd8c9ad 100644 --- a/AdminUser.gds +++ b/AdminUser.gds @@ -260,6 +260,7 @@ </div> <div class="input"> <%sql="select OA_CompetencyID from OA_Competency where OA_CompetencyUserID="&OA_UserID + response.write sql rs.open sql,objConn,1,1 do while not rs.Eof OA_CompetencyID = rs(0) -- Gitblit v1.9.1