Merge branch 'master' of http://121.42.53.174:3000/XMTT/storage.git

src/main/java/com/ekexiu/project/storage/system/service/SysService.java

@@ -249,7 +249,7 @@ public class SysService {
    @Path("/resetPw")
    @LoginUser
    public void resetPw(@JdbcConn(true) Connection con,String id)throws SQLException {
        this.userDao.changePw(con, StringUtil.md5(DEFAULT_PW_STR), id);
        this.userDao.changePw(con,DEFAULT_PW_STR, id);
    }
}