318 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiangZr-hhh	04f1798811	feat:日报模块 日报搜索接口 ... 添加日报搜索接口	2024-04-19 15:07:08 +08:00
xiangZr-hhh	037b36bf3f	patch:审核模块 ... 审核模块代码部分解耦，增加可读性	2024-04-19 14:21:48 +08:00
xiangZr-hhh	cada75e210	Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx	2024-04-19 13:45:42 +08:00
xiangZr-hhh	63619c389b	fix:审核模块 搜索接口修正	2024-04-19 13:45:21 +08:00
筱锋xiao_lfeng	62cd84e94e	Merge pull request 'feature-zrx' (#29) from feature-zrx into develop ... Reviewed-on: #29	2024-04-18 23:46:05 +08:00
筱锋xiao_lfeng	d36580b8ac	Merge branch 'develop' into feature-zrx	2024-04-18 23:28:53 +08:00
筱锋xiao_lfeng	bba63d9de7	Merge branch 'master' into develop	2024-04-18 23:21:56 +08:00
筱锋xiao_lfeng	308b4ab8fa	Merge pull request 'fix:子系统返回负责人名' (#27) from feature-jie into develop ... Reviewed-on: #27 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-18 23:20:55 +08:00
xiangZr-hhh	b03ff092a3	fix:审核模块 审核添加接口	2024-04-18 23:13:14 +08:00
xiangZr-hhh	2f706d5997	Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx	2024-04-18 23:11:30 +08:00
xiangZr-hhh	0be49e9a0a	fix:审核模块 审核添加接口	2024-04-18 23:11:23 +08:00
176yunxuan	b096ce21a2	fix:子系统返回负责人名	2024-04-18 23:08:42 +08:00
xiangZr-hhh	507d7e7d00	fix:日报模块查询我的日报接口 ... 分页查询修正	2024-04-18 22:39:34 +08:00
筱锋xiao_lfeng	4a0624e0a5	Merge pull request 'develop' (#26) from develop into master ... Reviewed-on: #26	2024-04-18 22:35:08 +08:00
筱锋xiao_lfeng	3527c250d4	Merge branch 'master' into develop	2024-04-18 22:34:30 +08:00
XiaoLFeng	b9aa1b25cc	fix(业务): 业务补丁 ... 数据库建表内容修改	2024-04-18 22:34:03 +08:00
XiaoLFeng	acb3fab074	fix(业务): 业务补丁 ... json 补丁	2024-04-18 22:32:39 +08:00
筱锋xiao_lfeng	3383fef3f0	Merge pull request 'fix:新增子系统，子模块，消息总数记录' (#25) from feature-jie into develop ... Reviewed-on: #25	2024-04-18 22:31:39 +08:00
筱锋xiao_lfeng	04a5eae117	Merge branch 'develop' into feature-jie	2024-04-18 22:31:33 +08:00
筱锋xiao_lfeng	f076baeccf	Merge pull request 'feature-zrx' (#24) from feature-zrx into develop ... Reviewed-on: #24	2024-04-18 22:30:34 +08:00
筱锋xiao_lfeng	e61b478225	Merge branch 'develop' into feature-zrx	2024-04-18 22:30:11 +08:00
176yunxuan	7d958bfa69	fix:申请模块根据名字查询项目，系统，模块	2024-04-18 22:25:07 +08:00
xiangZr-hhh	10b7133322	Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx	2024-04-18 20:03:57 +08:00
176yunxuan	5c33818e3d	fix:新增子系统，子模块，消息总数记录	2024-04-18 19:55:59 +08:00
xiangZr-hhh	84b2ab983a	fix:审核模块查询接口修正 ... 返回数据增加部分属性	2024-04-18 17:32:08 +08:00
xiangZr-hhh	f491d9a97f	fix:审核查询接口修正	2024-04-18 17:04:30 +08:00
xiangZr-hhh	0d05ea08fb	fix:审核查询接口修正 ... 增加部分权限判断	2024-04-18 16:53:11 +08:00
筱锋xiao_lfeng	725f5f7fee	Merge pull request 'develop' (#23) from develop into master ... Reviewed-on: #23	2024-04-18 16:33:19 +08:00
筱锋xiao_lfeng	893b5b2f7c	Merge pull request 'feature-jie' (#22) from feature-jie into develop ... Reviewed-on: #22	2024-04-18 16:32:10 +08:00
xiangZr-hhh	9c4cb174eb	feat:新增日报模块查询我的日报接口	2024-04-18 16:08:40 +08:00
XiaoLFeng	3e2b10c049	fix(业务): 业务补丁 ... json 补丁	2024-04-18 15:21:38 +08:00
176yunxuan	e0d4d0e9c7	fix:添加项目权限，名字模糊查询项目	2024-04-18 15:17:08 +08:00
xiangZr-hhh	121b87c683	feat:新增日志模块日志添加接口	2024-04-18 15:01:05 +08:00
xiangZr-hhh	71bd92d18e	patch:修正review数据库表 ... 删除部分错误外键	2024-04-18 10:18:35 +08:00
176yunxuan	3df0c754d3	fix:查询项目重构	2024-04-18 09:34:23 +08:00
筱锋xiao_lfeng	96c5b5f98c	Merge pull request 'develop' (#21) from develop into master ... Reviewed-on: #21	2024-04-17 23:08:53 +08:00
362612387	2880ffefa7	Merge pull request 'feature-jie' (#19) from feature-jie into develop ... Reviewed-on: #19	2024-04-17 21:03:29 +08:00
176yunxuan	2bd1d796ed	fix:我管理的状态查询	2024-04-17 20:43:27 +08:00
176yunxuan	d2dc0527ab	fix:查询子模块，删除子模块子系统	2024-04-17 20:30:31 +08:00
176yunxuan	84d3ccc5af	fix:我负责我管理我参与的项目查询重构以及项目增加,系统模块数据表增加截止时间和状态字段	2024-04-17 17:03:35 +08:00
XiaoLFeng	0516e8dce4	perf(配置): 添加启动项 ... 添加启动项 wyj 配置文件	2024-04-17 15:20:10 +08:00
XiaoLFeng	80478baf76	fix(service): 修复获取不到用户信息 ... 修复对于 token 的解析获取无法获取到 userDO 的情况进行异常返回	2024-04-17 11:20:40 +08:00
XiaoLFeng	a10fbce2f8	Merge branch 'refs/heads/develop'	2024-04-17 11:12:01 +08:00
筱锋xiao_lfeng	6b0c58dea9	Merge pull request 'bug:消息分页返回增加总数等字段' (#18) from feature-jie into develop ... Reviewed-on: #18 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-17 11:11:40 +08:00
XiaoLFeng	3e67b5b94c	fix(总体、控制层): 修复错误内容 ... - 对权限登出的 Redis 进行处理 - 修复接口漏洞	2024-04-17 11:10:15 +08:00
176yunxuan	22cb95d1d3	bug:消息分页返回增加总数等字段	2024-04-17 10:53:25 +08:00
XiaoLFeng	045147dc30	patch: 补丁	2024-04-17 01:13:57 +08:00
XiaoLFeng	75d471b1b6	patch: 补丁	2024-04-17 01:09:42 +08:00
筱锋xiao_lfeng	65a13ff549	Merge pull request 'Merge 推送至业务' (#17) from develop into master ... Reviewed-on: #17	2024-04-17 00:55:36 +08:00
XiaoLFeng	0a788005a6	patch: 补丁	2024-04-17 00:52:55 +08:00