374 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiangZr-hhh	f9f35dd4a0	fix:审核添加接口 ... 禁止向已被删除的项目添加	2024-04-22 22:06:48 +08:00
xiangZr-hhh	cbcce7687b	fix:审核模块删除修正 ... 添加删除	2024-04-22 21:54:18 +08:00
xiangZr-hhh	47e3e6820d	fix:项目删除 ... 项目删除时同时删除对应日报信息	2024-04-22 21:41:40 +08:00
xiangZr-hhh	4b8dc5d699	fix:日报模块查询接口 ... 增加项目被删除时的判空	2024-04-22 20:33:01 +08:00
xiangZr-hhh	e32bc023df	Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx	2024-04-22 20:29:46 +08:00
xiangZr-hhh	5b7daf5824	fix:审核模块删除审核sql ... 修正为假删除	2024-04-22 20:29:33 +08:00
xiangZr-hhh	4363831d80	patch：删除项目/子系统/模块 ... 同时删除对应审核信息	2024-04-22 20:15:54 +08:00
筱锋xiao_lfeng	35943549f9	Merge pull request 'bug:指定负责人判空' (#44) from feature-jie into develop ... Reviewed-on: #44 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-22 19:31:14 +08:00
176yunxuan	22e79558da	bug:指定负责人判空	2024-04-22 19:29:18 +08:00
筱锋xiao_lfeng	1fd49b0d8a	Merge pull request 'bug:子模块返回增加周期' (#43) from feature-jie into develop ... Reviewed-on: #43	2024-04-21 21:37:29 +08:00
176yunxuan	998f6a683e	bug:子模块返回增加周期	2024-04-21 21:31:46 +08:00
筱锋xiao_lfeng	72aafd8fae	Merge pull request 'fix:审核模块 审核添加接口' (#42) from feature-zrx into develop ... Reviewed-on: #42 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-21 18:56:12 +08:00
xiangZr-hhh	5129d18d17	fix:审核模块 审核添加接口 ... 增加判空	2024-04-21 18:40:23 +08:00
筱锋xiao_lfeng	bbb001d7e4	Merge pull request 'patch: 日报模块 添加日报模块' (#41) from feature-zrx into develop ... Reviewed-on: #41 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-21 14:51:54 +08:00
xiangZr-hhh	6be3aa4e13	patch: 日报模块 添加日报模块 ... 添加日报时添加发送消息 再再次修正日报时差问题	2024-04-21 14:44:09 +08:00
筱锋xiao_lfeng	075e7eb7c0	Merge pull request 'fix: 目标模块所有查询接口' (#40) from feature-zrx into develop ... Reviewed-on: #40 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-20 20:36:03 +08:00
xiangZr-hhh	c82ffe40de	fix: 目标模块所有查询接口 ... 再次修正8小时时差问题	2024-04-20 20:22:47 +08:00
筱锋xiao_lfeng	8c6db39165	Merge pull request 'fix: 目标模块所有查询接口' (#39) from feature-zrx into develop ... Reviewed-on: #39 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-20 19:56:27 +08:00
筱锋xiao_lfeng	7931981758	Merge branch 'develop' into feature-zrx	2024-04-20 19:56:14 +08:00
筱锋xiao_lfeng	d9526cda4f	Merge pull request 'fix:完善业务发送消息' (#37) from feature-jie into develop ... Reviewed-on: #37 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-20 19:55:56 +08:00
筱锋xiao_lfeng	d510831170	Merge branch 'develop' into feature-jie	2024-04-20 19:55:01 +08:00
xiangZr-hhh	b79148cd80	fix: 目标模块所有查询接口 ... 修正8小时时差问题	2024-04-20 19:53:40 +08:00
176yunxuan	abef74af38	fix:完善业务发送消息	2024-04-20 19:53:21 +08:00
筱锋xiao_lfeng	b466b82442	Merge pull request 'feature-zrx' (#38) from feature-zrx into develop ... Reviewed-on: #38 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-20 19:05:32 +08:00
xiangZr-hhh	ba4ed9fe5d	patch: 修正日报模块判空 ... 增加昵称字段给前端	2024-04-20 19:02:36 +08:00
176yunxuan	dca7d3c277	fix:完善业务发送消息	2024-04-20 16:07:20 +08:00
xiangZr-hhh	1d0bb44805	fix:审核模块与日报模块接口 ... 增加非空判断	2024-04-20 15:39:27 +08:00
xiangZr-hhh	fa6b524b98	fix: 项目模块 根据id获取对应模块与子系统 ... 增加非空判断	2024-04-20 15:30:53 +08:00
xiangZr-hhh	7f146cd2f5	patch：日报模块 ... 查询接口添加负责人字段，优化获取用户名称	2024-04-20 15:19:17 +08:00
筱锋xiao_lfeng	a54e8dafb8	Merge pull request 'fix:项目，系统，模块更新编辑' (#35) from feature-jie into develop ... Reviewed-on: #35 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-20 12:42:02 +08:00
176yunxuan	da387c04be	fix:增加判空	2024-04-20 12:33:17 +08:00
176yunxuan	9639d21c0e	fix:项目，系统，模块更新	2024-04-20 10:50:55 +08:00
176yunxuan	c229ed59b8	fix:项目，系统，模块更新	2024-04-20 10:44:07 +08:00
xiangZr-hhh	f57e949d65	Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx	2024-04-20 02:33:20 +08:00
xiangZr-hhh	1d588f4c2d	patch: 审核模块 ... 审批结果接口添加发送消息	2024-04-20 02:31:49 +08:00
xiangZr-hhh	ec2a30075d	feat: 新增接口 ... 根据项目id查询名下所有子系统 根据子系统id查询名下所有子模块	2024-04-20 02:16:43 +08:00
xiangZr-hhh	07601350bf	fix: 审核模块	2024-04-20 01:46:52 +08:00
筱锋xiao_lfeng	24c45812e8	Merge pull request 'feature-zrx' (#33) from feature-zrx into develop ... Reviewed-on: #33 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-20 00:19:08 +08:00
xiangZr-hhh	4a91ebed34	Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx	2024-04-19 23:28:35 +08:00
xiangZr-hhh	1197f77131	fix: 日报模块 添加接口	2024-04-19 23:28:00 +08:00
筱锋xiao_lfeng	cd97498b80	Merge pull request 'feature-zrx' (#32) from feature-zrx into develop ... Reviewed-on: #32	2024-04-19 22:41:30 +08:00
xiangZr-hhh	0719ecf538	patch:补丁 ... 对提出的问题进行修正	2024-04-19 20:42:00 +08:00
xiangZr-hhh	27268b5f3a	Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx	2024-04-19 19:38:21 +08:00
筱锋xiao_lfeng	80c7da422f	Merge pull request 'bug:子模块子系统查询，添加bug修复' (#30) from feature-jie into develop ... Reviewed-on: #30 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-19 19:15:34 +08:00
XiaoLFeng	75d9435911	fix(业务): 权限修改 ... 对于误修改部分进行补丁	2024-04-19 19:12:26 +08:00
xiangZr-hhh	1b6ea7b140	fix:日报模块 查询接口修正 ... xml文件修改	2024-04-19 19:10:47 +08:00
176yunxuan	a4aa3bd939	bug:子模块子系统查询和添加bug修复	2024-04-19 19:10:01 +08:00
176yunxuan	50050f820f	bug:子模块子系统查询和添加bug修复	2024-04-19 18:41:36 +08:00
176yunxuan	00938a07f9	Merge branch 'develop' into feature-jie	2024-04-19 18:36:15 +08:00
xiangZr-hhh	9ab6d1621b	fix:日报模块 查询接口修正 ... 增加部分属性	2024-04-19 18:13:52 +08:00