WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
342 Commits 5 Branches 0 Tags 3.2 MiB
d377efeaad
Commit Graph

342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XiaoLFeng
d377efeaad
Merge branch 'refs/heads/develop'
All checks were successful
代码检查 / 代码检查 (push) Successful in 24s
Details
2024-04-20 00:19:40 +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
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 24s
Details
2024-04-19 23:28:35 +08:00
xiangZr-hhh
1197f77131 fix: 日报模块 添加接口 2024-04-19 23:28:00 +08:00
XiaoLFeng
60388ca2da
Merge branch 'refs/heads/develop'
All checks were successful
代码检查 / 代码检查 (push) Successful in 25s
Details
2024-04-19 22:44:37 +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:补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
Details 
对提出的问题进行修正
 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
XiaoLFeng
9b50bac7e9
Merge branch 'refs/heads/develop'
All checks were successful
代码检查 / 代码检查 (push) Successful in 20s
Details
2024-04-19 19:15:56 +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(业务): 权限修改
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
Details 
对于误修改部分进行补丁
 2024-04-19 19:12:26 +08:00
xiangZr-hhh
1b6ea7b140 fix:日报模块 查询接口修正
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 21s
Details 
xml文件修改
 2024-04-19 19:10:47 +08:00
176yunxuan
a4aa3bd939 bug:子模块子系统查询和添加bug修复
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
Details
2024-04-19 19:10:01 +08:00
176yunxuan
50050f820f bug:子模块子系统查询和添加bug修复
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 3m47s
Details
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
XiaoLFeng
00b0ff49d1
Merge branch 'refs/heads/develop'
All checks were successful
代码检查 / 代码检查 (push) Successful in 22s
Details
2024-04-19 15:50:57 +08:00
XiaoLFeng
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
筱锋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
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
Details
2024-04-18 23:28:53 +08:00
筱锋xiao_lfeng
70b6cf5090 Merge pull request 'patch: 对漏洞内容进行补丁' (#28) from develop into master
All checks were successful
代码检查 / 代码检查 (push) Successful in 18s
Details 
Reviewed-on: #28
 2024-04-18 23:23:30 +08:00
筱锋xiao_lfeng
bba63d9de7 Merge branch 'master' into develop
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 15s
Details
2024-04-18 23:21:56 +08:00
筱锋xiao_lfeng
308b4ab8fa Merge pull request 'fix:子系统返回负责人名' (#27) from feature-jie into develop
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 15s
Details 
Reviewed-on: #27
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>
 2024-04-18 23:20:55 +08:00
xiangZr-hhh
b03ff092a3 fix:审核模块 审核添加接口
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 30s
Details
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
Details
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
All checks were successful
代码检查 / 代码检查 (push) Successful in 21s
Details 
Reviewed-on: #26
 2024-04-18 22:35:08 +08:00
筱锋xiao_lfeng
3527c250d4 Merge branch 'master' into develop
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
Details
2024-04-18 22:34:30 +08:00
XiaoLFeng
b9aa1b25cc
fix(业务): 业务补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
Details 
数据库建表内容修改
 2024-04-18 22:34:03 +08:00
XiaoLFeng
acb3fab074
fix(业务): 业务补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 17s
Details 
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
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
Details
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
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 15s
Details
2024-04-18 22:30:11 +08:00
176yunxuan
7d958bfa69 fix:申请模块根据名字查询项目，系统，模块
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
Details
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:新增子系统，子模块，消息总数记录
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 17s
Details
2024-04-18 19:55:59 +08:00
xiangZr-hhh
84b2ab983a fix:审核模块查询接口修正
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
Details 
返回数据增加部分属性
 2024-04-18 17:32:08 +08:00
xiangZr-hhh
f491d9a97f fix:审核查询接口修正
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
Details
2024-04-18 17:04:30 +08:00