Commit Graph

34 Commits (dd1f2fea3ac4ecf31dfb88ce88b4318304e47d2a)

Author SHA1 Message Date
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 7ab98189cb 更新格式 2021-01-09 17:21:38 +08:00
fengshuonan 1e62a588e0 更新菜单操作栏宽度 2021-01-09 16:14:44 +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 0bd88d4e68 更新修改头像接口 2021-01-09 10:53:03 +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 5bdd0ab2d2 整理修改菜单界面 2021-01-08 18:33:38 +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
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 5622fe502e 更新app界面 2021-01-06 16:37:40 +08:00
jiawei 5b7a807c9b 添加全局禁言样式 2021-01-05 20:47:02 +08:00
jiawei 7168036c49 系统参数模块开发 2021-01-05 20:46:19 +08:00
chenjinlong 336c5fa98b 【Organization】页面修改
【Position】页面规范整理
2021-01-05 09:17:44 +08:00
chenjinlong 8ce0dc8842 【Position】HttpRequest 替换 2021-01-04 15:15:11 +08:00
chenjinlong 3a70322904 Merge remote-tracking branch 'origin/group2' into group2 2021-01-04 10:01:34 +08:00
chenjinlong bc2500c518 Merge branch 'master' into group2
# Conflicts:
#	src/main/webapp/assets/common/js/common.js
2021-01-04 09:46:26 +08:00
fengshuonan 33c42e144d 整理修改密码的业务逻辑 2021-01-02 11:28:31 +08:00
fengshuonan 891e4e3f94 整理个人信息界面的接口 2021-01-01 22:42:08 +08:00
chenjinlong d9b8eca541 【Position】功能完善并且增加easyweb新组件用于copy 2020-12-31 00:52:25 +08:00
chenjinlong b5b8d75da2 【Organization】增加组织架构页面,功能暂未实现 2020-12-31 00:51:20 +08:00
chenjinlong d001335855 【ajaxUtil.js】ajax工具 2020-12-30 20:36:05 +08:00
chenjinlong 9c18bb4afa 【position】增加职位管理 2020-12-29 21:56:12 +08:00
fengshuonan 37d23b2830 初始化提交 2020-12-27 16:15:37 +08:00