Commit Graph

27 Commits (5bdd0ab2d2d29e00404d240967c7e97b659c9e17)

Author SHA1 Message Date
fengshuonan 5bdd0ab2d2 整理修改菜单界面 2021-01-08 18:33:38 +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 cbcbd85a8c 更新通用tree选择器 2021-01-06 20:31:18 +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
jiawei 7168036c49 系统参数模块开发 2021-01-05 20:46:19 +08:00
fengshuonan da1a60f216 视图页面,加上/view开头,菜单列表的字段修改 2021-01-05 16:35: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 a742c45dab 【Organization】页面修改 2020-12-31 01:06:59 +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 680c697d4b Merge remote-tracking branch 'origin/master' into group2
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/login/PositionViewController.java
2020-12-30 17:01:49 +08:00
fengshuonan da60c89600 新增个人信息界面和修改密码界面,待联调接口 2020-12-29 22:33:56 +08:00
chenjinlong 9c18bb4afa 【position】增加职位管理 2020-12-29 21:56:12 +08:00
fengshuonan 0de7eee12f 更新工作台和分析页两个界面,更新锁屏界面 2020-12-29 21:38:11 +08:00
fengshuonan b7f7a9c3e2 更改layout的文件夹名称 2020-12-27 16:17:06 +08:00
fengshuonan 37d23b2830 初始化提交 2020-12-27 16:15:37 +08:00