feature-zrx #32

Merged
XiaoLFeng merged 12 commits from feature-zrx into develop 2024-04-19 22:41:30 +08:00

12 Commits

Author SHA1 Message Date
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
xiangZr-hhh
1b6ea7b140 fix:日报模块 查询接口修正
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 21s
xml文件修改
2024-04-19 19:10:47 +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
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