Merge remote-tracking branch 'origin/master'

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

@@ -219,7 +219,7 @@ function setProjectValue(data) {
 
 // 根据id获取用户信息
 function getUserById() {
-    let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
+    let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: true, time: 0,});
     let url = dataUrl + "/users/getById";
     let params = {
         id: idParam