Merge remote-tracking branch 'origin/master'

src/main/resources/static/js/system/child/userFormTemp.js

@@ -220,6 +220,7 @@ function setProjectValue(data) {
 // 根据id获取用户信息
 function getUserById() {
     let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: true, time: 0,});
+    setTimeout(() => {
         let url = dataUrl + "/users/getById";
         let params = {
             id: idParam
@@ -240,6 +241,7 @@ function getUserById() {
             layer.close(loadingMsg); // 关闭提示层
             error(xhr)
         });
+    }, 100)
 }
 
 // 设置表单内容