From 3c470b15b952b86c1e38cb9634190a12ccf3d38d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 22 Jul 2020 15:32:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html
index 410386c..1dae744 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html
@@ -106,6 +106,7 @@
                         layer.closeAll('loading');
                         if (data.code == 0) {
                             layer.msg(data.msg, { icon: 1, time: 500 });
+                            layer.alert("密码重置为:"+data.data, {icon: 1});
                         } else {
                             layer.msg(data.msg, { icon: 2, time: 500 });
                         }

--
Gitblit v1.8.0