Commit Graph

Select branches

Hide Pull Requests

Leei

clay

dev

dev_tangjian_hongkun

dev_wenhua

dev_wenhua_plus

leei

leeiNew

master

prod

tangjian

tangjian_new

tangjian（TEST）

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#4

#5

#6

#7

#8

#9

Mono Color

• d9c182ad1d feat: 测试提交3 tangjian（TEST） Jim__TT 2024-01-28 20:22:25 +08:00
• 9fc4fd86ae feat: 测试新增2 Jim__TT 2024-01-28 19:59:34 +08:00
• 39cbd5905d feat: 测试新增1 Jim__TT 2024-01-28 19:59:13 +08:00
• 37fc934233 Merge pull request 'dev_wenhua_plus' (#29) from dev_wenhua_plus into dev dev wenhua 2023-12-11 07:28:36 +00:00
• aebbaadfac feat: 新增权限按钮 dev_wenhua_plus wenhua 2023-12-11 15:26:18 +08:00
• 6929f6535c Merge pull request 'dev' (#28) from dev into dev_wenhua_plus wenhua 2023-11-30 03:17:53 +00:00
• e2f2b1518c 更新 '.drone.yml' clay 2023-11-28 03:25:19 +00:00
• 78aeee5871 雷闳焜：完成富文本编辑器的部分，由于下载引入老出问题，暂时用云调用 leeiNew Lhk0001 2023-11-23 16:59:07 +08:00
• 912d6b2a7e Merge branch 'leeiNew' of http://git.feashow.cn/wenhua/fateverse-react into leeiNew Lhk0001 2023-11-23 13:35:22 +08:00
• a6b6c20ffe 完成大致富文本编辑器（因为本地下载引入一直出错，暂时先用云加载） Lhk0001 2023-11-23 13:24:15 +08:00
• e0d42f8913 Merge pull request '修改base 为 /' (#27) from dev_wenhua_plus into dev wenhua 2023-11-20 14:10:53 +00:00
• 4ed199fc89 修改base 为 / wenhua 2023-11-20 22:10:13 +08:00
• 1b68171ea0 Merge pull request '更改登录懒加载' (#26) from dev_wenhua_plus into dev wenhua 2023-11-20 14:01:41 +00:00
• ae23186c56 更改登录懒加载 wenhua 2023-11-20 22:01:05 +08:00
• 5651213a6b Merge pull request 'dev' (#25) from dev into leeiNew wenhua 2023-11-20 13:27:36 +00:00
• f87666b1de Merge pull request '唐简：提交新分支' (#24) from tangjian_new into dev wenhua 2023-11-20 13:25:22 +00:00
• f6889ac3df 唐简：提交新分支 tangjian_new Jim__TT 2023-11-20 21:24:43 +08:00
• c1ae6a9e31 Merge pull request '修改api路径问题，以及部分没用变量注释（有一个暂时不敢动）' (#23) from leeiNew into dev wenhua 2023-11-20 12:54:56 +00:00
• 95b5604801 修改api路径问题，以及部分没用变量注释（有一个暂时不敢动） Lhk0001 2023-11-20 20:52:43 +08:00
• 9a6bd457b0 Merge pull request 'leeiNew' (#22) from leeiNew into dev wenhua 2023-11-20 12:00:28 +00:00
• 75a5d5a355 唐简：完成通知通告模块 tangjian Jim__TT 2023-11-19 12:05:45 +08:00
• 3995318ff8 修复问题文件 wenhua 2023-11-18 14:50:05 +08:00
• add8a9524d 雷的新建分支 Lhk0001 2023-11-18 14:37:29 +08:00
• d403cd42ab 唐简：echart编辑器demo Jim__TT 2023-11-16 17:59:46 +08:00
• 2b2a5c65aa ci: 测试ci dev_tangjian_hongkun clay 2023-11-11 17:25:38 +08:00
• d6b9d4baca ci: 测试ci clay 2023-11-11 17:25:30 +08:00
• ea1557e8a3 Merge pull request 'dev' (#19) from dev into prod prod clay 2023-11-11 09:19:40 +00:00
• 3c4f562e17 ci: 测试ci clay 2023-11-11 17:18:44 +08:00
• b59c94fbd3 Merge pull request '11' (#17) from dev_wenhua_plus into dev wenhua 2023-11-11 09:17:05 +00:00
• 4315e42521 11 wenhua 2023-11-11 17:16:03 +08:00
• ae8e8cd9c0 ci: 测试ci clay 2023-11-11 17:13:56 +08:00
• f86a49d1e8 Merge pull request 'ci : 测试ci运行' (#14) from clay into dev clay 2023-11-11 08:56:05 +00:00
• e220831a64 ci: 测试ci clay clay 2023-11-11 16:55:15 +08:00
• ca4bc80156 Merge pull request 'feat: 新增菜单图标, 搜索组件' (#13) from dev_wenhua_plus into dev wenhua 2023-11-10 06:32:29 +00:00
• ff24a5cec9 feat: 新增菜单图标, 搜索组件 wenhua 2023-11-10 14:31:25 +08:00
• 1ad4901079 feat: 添加菜单图标, 及搜索表单组件 dev_wenhua wenhua 2023-11-10 14:07:08 +08:00
• 08811a5275 雷闳焜:完成部门页面开发 leei Lhk0001 2023-11-02 22:41:47 +08:00
• 7dbb60d774 ci : 测试ci运行 clay 2023-11-01 22:43:52 +08:00
• 2eeaf31cf4 Merge pull request 'ci : 测试ci运行' (#10) from clay into dev clay 2023-11-01 14:35:36 +00:00
• 20c98c6ed2 ci : 测试ci运行 clay 2023-11-01 22:34:55 +08:00
• 0e828bd15f Merge pull request 'ci : 测试ci运行' (#9) from clay into dev clay 2023-11-01 14:34:18 +00:00
• 460a5bd060 ci : 测试ci运行 clay 2023-11-01 22:33:49 +08:00
• a1d8629dbe Merge pull request 'ci : 测试ci运行' (#8) from clay into dev clay 2023-11-01 14:32:40 +00:00
• e489bfa89c ci : 测试ci运行 clay 2023-11-01 22:31:49 +08:00
• 23cebffc12 温华:暂时修复打包失败问题 wenhua 2023-11-01 11:30:19 +08:00
• 58523423d5 Merge pull request '添加 'Dockerfile'' (#7) from clay-patch-1 into master master clay 2023-11-01 03:00:19 +00:00
• c990ace677 添加 'Dockerfile' clay 2023-11-01 02:59:38 +00:00
• 0ceb87b234 Merge pull request '添加 'docker.sh'' (#6) from clay-patch-1 into master clay 2023-11-01 02:58:36 +00:00
• 2751816113 添加 'docker.sh' clay 2023-11-01 02:58:23 +00:00
• cd817c479e Merge pull request '添加 'deployment.yml'' (#5) from clay-patch-1 into master clay 2023-11-01 02:57:33 +00:00
• a3f4ea5af7 添加 'deployment.yml' clay 2023-11-01 02:57:12 +00:00
• 9a51189ec3 Merge pull request '添加 '.dockerignore'' (#4) from clay-patch-1 into master clay 2023-11-01 02:56:01 +00:00
• dda4b377fe 添加 '.dockerignore' clay 2023-11-01 02:55:44 +00:00
• 6c2ef50d74 Merge pull request '添加 'nginx.conf'' (#3) from clay-patch-1 into master clay 2023-11-01 02:53:46 +00:00
• 493456c839 添加 'nginx.conf' clay 2023-11-01 02:53:27 +00:00
• d6ce344331 Merge pull request '添加 '.drone.yml'' (#2) from clay-patch-1 into master clay 2023-11-01 02:51:50 +00:00
• 06dc2b3dd1 添加 '.drone.yml' clay 2023-11-01 02:51:37 +00:00
• 9015599fcb 唐简：修复部门树点击无法搜索bug，修复点击重置按钮无法清空时间选择框bug Jim__TT 2023-10-31 23:09:34 +08:00
• 6f9a8906eb 唐简：完成岗位管理页面开发 Jim__TT 2023-10-31 19:56:34 +08:00
• c8f4f5e21a bug基本修复，还有一个日期重置暂时没有解决 Lhk0001 2023-10-27 19:47:56 +08:00
• d1b1b2b225 副本（test） Lhk0001 2023-10-27 16:55:28 +08:00
• 41807b7937 唐简: 修复了部门树不可展开 Jim__TT 2023-10-27 08:49:44 +08:00
• f92070bd73 唐简：修复部门搜索功能异常 Jim__TT 2023-10-25 11:44:53 +08:00
• 3248fa2c5a 唐简: 完成代码结构优化重构 Jim__TT 2023-10-23 22:54:43 +08:00
• 96ce9246ee 新增，修改，查询,删除功能，有一点bug Lhk0001 2023-10-21 18:38:19 +08:00
• a8a6ae2669 唐简：增加新增，修改，查询功能，完成用户管理页面开发 Jim__TT 2023-10-21 00:00:17 +08:00
• eaee821e72 唐简: 用户列表展示，查询，分页功能完成 Jim__TT 2023-10-19 02:13:27 +08:00
• 985e91fbd8 唐简：测试提交 Jim__TT 2023-10-17 14:10:22 +08:00
• b82c4dbc65 唐简：测试提交 Jim__TT 2023-10-17 14:09:47 +08:00
• a6433b979a tangjian: 测试提交 Jim__TT 2023-10-17 11:14:30 +08:00
• 76f825e47c Merge branch 'tangjian' of http://git.feashow.cn/wenhua/fateverse-react into tangjian Jim__TT 2023-10-17 02:24:46 +08:00
• b4545ec182 feat: User模块UI界面搭建完成 Jim__TT 2023-10-17 02:23:12 +08:00
• 1e768b147f 温华: 添加authstore并对数据做终端缓存 wenhua 2023-10-16 14:29:50 +08:00
• 4bf63e1306 温华: 添加404路由到常驻路由表 wenhua 2023-10-16 14:28:58 +08:00
• 72392e9571 温华: 精简Layout文件 wenhua 2023-10-16 14:28:05 +08:00
• 28047d7061 温华: 修改按钮权限组件为无权限移除节点 wenhua 2023-10-16 14:27:35 +08:00
• 60788d7090 温华: 迁移路由请求和用户信息请求到路由拦截处 wenhua 2023-10-16 14:26:37 +08:00
• 730b12c2e4 温华: 登录用户信息api wenhua 2023-10-16 14:25:15 +08:00
• ebd850dc73 测试 Leei Lhk0001 2023-10-15 23:51:56 +08:00
• 28ed1925a7 test 提交代码 Jim__TT 2023-10-15 23:46:42 +08:00
• 79d9099237 create tangjian branch Jim__TT 2023-10-15 22:56:21 +08:00
• beb4677de8 Merge pull request '温华: 配置stores终端缓存黑名单' (#1) from dev into master wenhua 2023-10-15 06:48:46 +00:00
• 5b1de2c4b9 温华: 配置stores终端缓存黑名单 wenhua 2023-10-15 14:48:11 +08:00
• 46f7756cec 初始化hooks占位文件 wenhua 2023-10-13 16:28:13 +08:00
• 6f0949e432 初始化fateverse wenhua 2023-10-13 16:23:20 +08:00