Commit Graph

89 Commits (08d6bfb0bf676b4f58c9e364ac506924807a1f09)

Author SHA1 Message Date
fengshuonan 08d6bfb0bf 整理控制器格式规范,统一修改以/view开头 2021-01-10 19:58:39 +08:00
fengshuonan e567f77da7 删除druid的自动配置,转移到kernel包 2021-01-10 13:54:19 +08:00
fengshuonan 591e0b2345 更新本地库的配置 2021-01-10 09:54:08 +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
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
fengshuonan 7ab98189cb 更新格式 2021-01-09 17:21:38 +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 1e62a588e0 更新菜单操作栏宽度 2021-01-09 16:14:44 +08:00
q18idc 4bd57e8cb0 【system】更新菜单按钮管理控制器注释 2021-01-09 16:13:37 +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
chenjinlong 6bdc0abcb1 【application-dev.yml】修改beetl版本dev数据库 2021-01-09 12:35:43 +08:00
fengshuonan 074703b161 增加角色管理界面的按钮绑定权限 2021-01-09 12:08:00 +08:00
fengshuonan 0bd88d4e68 更新修改头像接口 2021-01-09 10:53:03 +08:00
陈立 48b90d2b75 修改配置并将druid配置放到bean里 2021-01-09 10:28:47 +08:00
fengshuonan a21d1d451d 更新一个按钮名 2021-01-08 23:01:58 +08:00
fengshuonan 8bda78513a 更新资源管理界面 2021-01-08 22:27:59 +08:00
fengshuonan a82021ab9b 更新资源管理界面 2021-01-08 22:25:43 +08:00
fengshuonan f6556c0637 更新角色列表,新增,修改功能 2021-01-08 21:54:19 +08:00
fengshuonan fd3def6602 更新header的应用列表获取 2021-01-08 20:53:52 +08:00
陈立 37658803c8 修改配置并将druid配置放到bean里 2021-01-08 18:49:38 +08:00
fengshuonan 5bdd0ab2d2 整理修改菜单界面 2021-01-08 18:33:38 +08:00
@阿坤同学 3aadb055dc 【定时模块】新增视图返回接口,新增CRUD页面 2021-01-08 17:08:25 +08:00
TSQ 928dad93b4 Merge branch 'group2-yml' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl 2021-01-08 10:29:20 +08:00
chenjinlong 52bedc3178 【User】用户管理功能完善 2021-01-07 22:31:19 +08:00
chenjinlong 407386485a 【UserViewController】增加视图控制器 2021-01-07 19:27:53 +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
chenjinlong c783f0f2ef 【application-dev.yml】修改beetl版本dev数据库 2021-01-07 18:37:08 +08:00
TSQ 91ee8f16ab Merge remote-tracking branch 'origin/master' 2021-01-07 08:59:13 +08:00
fengshuonan 45e340f7be 整理完成新增菜单 2021-01-06 22:36:23 +08:00
TSQ c1d7c9c9c8 调整日志视图控制器命名规范 2021-01-06 21:44:35 +08:00
TSQ 6b3fa84872 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl 2021-01-06 21:29:27 +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
fengshuonan c829c6cea8 更新菜单列表,查询,删除 2021-01-06 20:31:53 +08:00
fengshuonan cbcbd85a8c 更新通用tree选择器 2021-01-06 20:31:18 +08:00
fengshuonan 3dd68a7219 更新ztree-object的封装 2021-01-06 17:56:17 +08:00
fengshuonan 4ca1437f66 更新json日期返回前端的格式化 2021-01-06 16:38:10 +08:00
fengshuonan 5622fe502e 更新app界面 2021-01-06 16:37:40 +08:00
fengshuonan 5c5901eb1b 更改dashboard名称 2021-01-06 13:34:52 +08:00
jiawei 12aa666a51 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-config 2021-01-05 20:49:14 +08:00