gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity
115 Commits
4 Branches
41 Tags
52 MiB
Commit Graph

74 Commits (4e15a3279f75ca3cd74a0a8e5c3e90193f5ad75d)

Author SHA1 Message Date
huangyao 4e15a3279f Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-12 22:53:07 +08:00
huangyao d1d8c9c9f4 将字典树移到底层； 2021-01-12 22:52:58 +08:00
fengshuonan 9b163bb7e4 Merge remote-tracking branch 'origin/group2-organization' 2021-01-12 22:38:09 +08:00
chenjinlong b12701e9b5 【User】用户管理功能完善 2021-01-12 22:17:11 +08:00
fengshuonan dfb121d45a Merge remote-tracking branch 'origin/group2-organization' 2021-01-12 22:04:12 +08:00
chenjinlong 38c23ebfb2 【User】用户管理功能完善 2021-01-12 22:02:02 +08:00
chenjinlong b60f865cb2 【User】用户管理功能完善 2021-01-12 22:00:57 +08:00
fengshuonan e901c50a98 Merge remote-tracking branch 'origin/group5-log' 2021-01-12 22:00:25 +08:00
chenjinlong c8a22f80c4 【User】用户管理功能完善 2021-01-12 22:00:20 +08:00
fengshuonan 638c236aed Merge remote-tracking branch 'origin/group2-sysUser' 
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/user/UserViewController.java
 2021-01-12 21:20:29 +08:00
chenjinlong 2f38eea750 【organization】树控件替换 2021-01-12 20:56:58 +08:00
chenjinlong 057f88699c 【sysUser】分配角色，职务选择功能完善 2021-01-12 19:56:05 +08:00
TSQ e7230f2541 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl 2021-01-12 13:47:24 +08:00
TSQ 329afc5f45 完善日志管理列表功能，完善查看详情，删除日志功能 2021-01-12 13:47:07 +08:00
huangyao c366cc45ad Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-12 12:52:57 +08:00
fengshuonan 9090c42346 更新在线用户逻辑 2021-01-11 23:11:44 +08:00
huangyao 09e48f3d6e Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-11 21:46:02 +08:00
huangyao ad90aeb696 字典树； 
添加字典；
 2021-01-11 21:45:31 +08:00
fengshuonan 08d6bfb0bf 整理控制器格式规范，统一修改以/view开头 2021-01-10 19:58:39 +08:00
chenjinlong c3b48bc809 【sysUser】功能完善 2021-01-10 18:40:15 +08:00
huangyao acc28aa372 字典类型添加编辑； 
字典列表；
字典树；
 2021-01-10 18:36:45 +08:00
huangyao 04a76c1409 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-10 13:05:32 +08:00
fengshuonan 1c61eb8417 Merge remote-tracking branch 'origin/group7-monitor' 
# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/application-local.yml
 2021-01-09 20:41:58 +08:00
fengshuonan c8b7aebf01 Merge remote-tracking branch 'origin/group5-log' 2021-01-09 20:39:41 +08:00
fengshuonan 2c4cbe0946 Merge remote-tracking branch 'origin/group3-timer' 2021-01-09 20:38:56 +08:00
fengshuonan dd1f2fea3a Merge remote-tracking branch 'origin/group1-role' 
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/role/RoleViewController.java
 2021-01-09 20:37:32 +08:00
huangyao e27dade3b1 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-09 20:06:08 +08:00
fengshuonan 193d58bf8c 完善角色修改数据范围的界面 2021-01-09 19:23:34 +08:00
rays 05abaf4209 1.新增角色菜单和按钮授权以及接口授权 
2.新增资源详情
 2021-01-09 19:19:41 +08:00
fengshuonan 0bec97ae72 调整按钮管理样式 2021-01-09 17:31:28 +08:00
TSQ 306724a394 完善日志管理列表 2021-01-09 17:11:00 +08:00
fengshuonan 08af106329 Merge remote-tracking branch 'origin/group1-button' 2021-01-09 16:29:49 +08:00
q18idc aab7aa4781 【system】添加不允许修改菜单按钮code 2021-01-09 16:23:50 +08:00
fengshuonan 86cda799f0 Merge remote-tracking branch 'origin/group1-button' 2021-01-09 16:11:14 +08:00
q18idc 9a00b19ffe 【system】完成菜单按钮管理界面 2021-01-09 15:17:19 +08:00
fengshuonan faf00cf394 Merge remote-tracking branch 'origin/group2-user' 2021-01-09 12:37:09 +08:00
fengshuonan 074703b161 增加角色管理界面的按钮绑定权限 2021-01-09 12:08:00 +08:00
fengshuonan a21d1d451d 更新一个按钮名 2021-01-08 23:01:58 +08:00
fengshuonan a82021ab9b 更新资源管理界面 2021-01-08 22:25:43 +08:00
fengshuonan f6556c0637 更新角色列表，新增，修改功能 2021-01-08 21:54:19 +08:00
fengshuonan 5bdd0ab2d2 整理修改菜单界面 2021-01-08 18:33:38 +08:00
@阿坤同学 3aadb055dc 【定时模块】新增视图返回接口，新增CRUD页面 2021-01-08 17:08:25 +08:00
chenjinlong 52bedc3178 【User】用户管理功能完善 2021-01-07 22:31:19 +08:00
chenjinlong dc3c688868 【hr_organization】功能调整优化 2021-01-07 19:27:11 +08:00
chenjinlong 8116103641 【hr_organization】功能调整优化 2021-01-07 19:08:10 +08:00
fengshuonan 45e340f7be 整理完成新增菜单 2021-01-06 22:36:23 +08:00
huangyao d960e748ab Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl 2021-01-06 22:14:38 +08:00
huangyao df8afb97f6 字典类型视图； 
字典类型添加（字典业务编码待添加）；
 2021-01-06 22:11:46 +08:00
fengshuonan 10c862e1de Merge remote-tracking branch 'origin/group1-config' 2021-01-06 20:53:18 +08:00
fengshuonan 84517ec302 Merge remote-tracking branch 'origin/group2' 2021-01-06 20:45:19 +08:00