Commit Graph

117 Commits

Author SHA1 Message Date
zhangzhiqiang
78cb2023a8 usersql 2022-12-16 14:35:53 +08:00
zhangzhiqiang
e3c3ca6dcc 1 2022-12-16 14:32:00 +08:00
71c20c1f6a Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-16 14:23:36 +08:00
43a2a95e55 excel 2022-12-16 14:23:21 +08:00
zhangzhiqiang
040734cd92 替换opt 2022-12-16 14:22:34 +08:00
52117f32b6 角色 2022-12-16 14:16:43 +08:00
ee0eaacc2d 角色管理 2022-12-16 14:15:19 +08:00
ludj
7d8ac0debf Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-16 14:14:51 +08:00
ludj
748b21dd51 Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server
# Conflicts:
#	nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java
#	nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
2022-12-16 14:14:28 +08:00
zhangzhiqiang
a9060bfb47 排序 2022-12-16 14:13:26 +08:00
ludj
59ec8e4356 代码更新 2022-12-16 14:10:58 +08:00
zhangzhiqiang
95ead132ba mdf:uservue 2022-12-16 11:32:05 +08:00
67bdfa66c9 Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-15 20:49:08 +08:00
4e179f70f0 1 2022-12-15 20:48:51 +08:00
zhangzhiqiang
8cdcf6c014 fix:用户,部门 2022-12-15 20:48:22 +08:00
37547f908f 角色 2022-12-15 20:25:31 +08:00
ludj
f57dc5ed9e 分页修改 2022-12-15 20:24:20 +08:00
zhangzhiqiang
08883f074b dept 2022-12-15 19:06:24 +08:00
zhangzhiqiang
bfaa24053b yml 2022-12-15 18:56:46 +08:00
6790b8cefc 代码更新 2022-12-15 18:43:00 +08:00
c0d2354f05 e 2022-12-15 18:38:28 +08:00
1d94ae565f qq 2022-12-15 18:36:19 +08:00
0d25313927 1 2022-12-15 18:29:19 +08:00
fada0fb994 q 2022-12-15 18:27:49 +08:00
zhangzhiqiang
533374bd95 Merge remote-tracking branch 'origin/master' 2022-12-15 18:22:52 +08:00
zhangzhiqiang
9b4148bdc4 user 2022-12-15 18:22:44 +08:00
ludj
88324f26fd 菜单角色修改 2022-12-15 17:04:42 +08:00
zhangzhiqiang
c00558fce3 user 2022-12-15 16:07:40 +08:00
zhangzhiqiang
8fea54e226 query 2022-12-15 15:45:52 +08:00
zhangzhiqiang
8e9d214f44 登入 2022-12-15 15:20:08 +08:00
zhangzhiqiang
c4844b3ad5 user 2022-12-15 14:36:59 +08:00
zhangzhiqiang
a4720ea15e user 2022-12-15 14:36:35 +08:00
zhangzhiqiang
2046d2276d user 2022-12-15 14:33:03 +08:00
zhangzhiqiang
2545e92dde query 2022-12-15 11:33:30 +08:00
zhangzhiqiang
03d061d320 user 2022-12-15 10:45:40 +08:00
zhangzhiqiang
881c903115 user 2022-12-15 10:32:04 +08:00
zhangzhiqiang
480159c64a user 2022-12-15 10:20:12 +08:00
zhangzhiqiang
216d1d154d user 2022-12-15 10:13:19 +08:00
zhangzhiqiang
6181a5685d 修改代码生成 2022-12-15 09:56:28 +08:00
zhangzhiqiang
426e5e4895 修改代码生成 2022-12-15 09:50:02 +08:00
zhangzhiqiang
ced01e20c4 user 2022-12-14 18:05:28 +08:00
zhangzhiqiang
ec0b8b7bc3 1 2022-12-14 17:18:25 +08:00
zhangzhiqiang
373f983618 1 2022-12-14 17:16:17 +08:00
zhangzhiqiang
52e919d527 1 2022-12-14 17:14:59 +08:00
zhangzhiqiang
d72c58829e add:demo 2022-12-14 17:07:22 +08:00
zhangzhiqiang
104c563565 add:依赖mybatisplus3 2022-12-14 16:47:48 +08:00
zhangzhiqiang
b168be746c add:依赖mybatisplus2 2022-12-14 16:42:59 +08:00
zhangzhiqiang
79d6261ef4 Merge remote-tracking branch 'origin/master' 2022-12-14 15:46:22 +08:00
zhangzhiqiang
2e543adab5 add:依赖mybatisplus 2022-12-14 15:43:50 +08:00
d3e526e8f9 代码修改 2022-12-07 14:09:23 +08:00