From f38d69d70e3e126d2f58971d0b4854f2aa144fc1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 22 八月 2025 14:40:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
index 32fada2..1292e28 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
@@ -58,7 +58,7 @@
<label class="col-sm-3 control-label">*所在市：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="cCode" name="cCode" >
- @for(obj in city){
+ @for(obj in city!){
<option style="width: 300px" value="${obj.code}"${obj.name == data.province ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
@@ -76,7 +76,7 @@
<div class="form-group" >
<label class="col-sm-3 control-label">*生日：</label>
<div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" class="form-control" value="${birthday}" id="birthday" placeholder="请选择" type="date">
+ <input style="width: 300px" class="form-control" value="${birthday!}" id="birthday" placeholder="请选择" type="date">
</div>
</div>
<div class="form-group" >
--
Gitblit v1.7.1