Commit Graph

298 Commits

Author SHA1 Message Date
176yunxuan
22e79558da bug:指定负责人判空
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-22 19:29:18 +08:00
176yunxuan
998f6a683e bug:子模块返回增加周期
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 6m24s
2024-04-21 21:31:46 +08:00
xiangZr-hhh
5129d18d17 fix:审核模块 审核添加接口
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 35s
增加判空
2024-04-21 18:40:23 +08:00
xiangZr-hhh
6be3aa4e13 patch: 日报模块 添加日报模块
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 34s
添加日报时添加发送消息
再再次修正日报时差问题
2024-04-21 14:44:09 +08:00
xiangZr-hhh
c82ffe40de fix: 目标模块所有查询接口
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
再次修正8小时时差问题
2024-04-20 20:22:47 +08:00
7931981758 Merge branch 'develop' into feature-zrx
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
2024-04-20 19:56:14 +08:00
d510831170 Merge branch 'develop' into feature-jie
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
2024-04-20 19:55:01 +08:00
xiangZr-hhh
b79148cd80 fix: 目标模块所有查询接口
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 21s
修正8小时时差问题
2024-04-20 19:53:40 +08:00
176yunxuan
abef74af38 fix:完善业务发送消息
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 17s
2024-04-20 19:53:21 +08:00
xiangZr-hhh
ba4ed9fe5d patch: 修正日报模块判空
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 15s
增加昵称字段给前端
2024-04-20 19:02:36 +08:00
176yunxuan
dca7d3c277 fix:完善业务发送消息
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 21s
2024-04-20 16:07:20 +08:00
xiangZr-hhh
1d0bb44805 fix:审核模块与日报模块接口
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 20s
增加非空判断
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
176yunxuan
da387c04be fix:增加判空
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
2024-04-20 12:33:17 +08:00
176yunxuan
9639d21c0e fix:项目,系统,模块更新
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 20s
2024-04-20 10:50:55 +08:00
176yunxuan
c229ed59b8 fix:项目,系统,模块更新
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 22s
2024-04-20 10:44:07 +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
xiangZr-hhh
1197f77131 fix: 日报模块 添加接口 2024-04-19 23:28:00 +08:00
xiangZr-hhh
0719ecf538 patch:补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
对提出的问题进行修正
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
75d9435911
fix(业务): 权限修改
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
对于误修改部分进行补丁
2024-04-19 19:12:26 +08:00
xiangZr-hhh
1b6ea7b140 fix:日报模块 查询接口修正
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 21s
xml文件修改
2024-04-19 19:10:47 +08:00
176yunxuan
a4aa3bd939 bug:子模块子系统查询和添加bug修复
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-19 19:10:01 +08:00
176yunxuan
50050f820f bug:子模块子系统查询和添加bug修复
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 3m47s
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
xiangZr-hhh
3f715f50a3 feat:日报模块 修改日报接口 2024-04-19 17:56:38 +08:00
xiangZr-hhh
b8b1ebd3cf Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx
# Conflicts:
#	src/main/java/com/jsl/oa/config/startup/PermissionList.java
2024-04-19 17:13:01 +08:00
xiangZr-hhh
19b3829025 fix:日报模块
日报添加接口修正
2024-04-19 17:12:16 +08:00
xiangZr-hhh
cf4921397c feat:日报模块 日报删除接口 2024-04-19 16:36:18 +08:00
22777ab159
fix(业务): 权限修改
对权限输入错误的内容进行修改,权限规范化修改
2024-04-19 15:50:36 +08:00
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
176yunxuan
1e46fe8476 fix:子模块返回 2024-04-19 13:18:39 +08:00
d36580b8ac Merge branch 'develop' into feature-zrx
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-18 23:28:53 +08:00
xiangZr-hhh
b03ff092a3 fix:审核模块 审核添加接口
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 30s
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:子系统返回负责人名
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-18 23:08:42 +08:00
xiangZr-hhh
507d7e7d00 fix:日报模块查询我的日报接口
分页查询修正
2024-04-18 22:39:34 +08:00
b9aa1b25cc
fix(业务): 业务补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
数据库建表内容修改
2024-04-18 22:34:03 +08:00
acb3fab074
fix(业务): 业务补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 17s
json 补丁
2024-04-18 22:32:39 +08:00
04a5eae117 Merge branch 'develop' into feature-jie
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
2024-04-18 22:31:33 +08:00
e61b478225 Merge branch 'develop' into feature-zrx
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 15s
2024-04-18 22:30:11 +08:00
176yunxuan
7d958bfa69 fix:申请模块根据名字查询项目,系统,模块
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
2024-04-18 22:25:07 +08:00