feature-zrx #32

Merged

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

Conversation 0 Commits 12 Files Changed 19 +491 -140

xiangZr-hhh commented 2024-04-19 21:04:29 +08:00

Owner

Copy Link

No description provided.

xiangZr-hhh added 12 commits 2024-04-19 21:04:29 +08:00

fix:审核模块 搜索接口修正 63619c389b

Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx cada75e210

patch:审核模块 ... 037b36bf3f

审核模块代码部分解耦，增加可读性

feat:日报模块 日报搜索接口 ... 04f1798811

添加日报搜索接口

feat:日报模块 日报删除接口 cf4921397c

fix:日报模块 ... 19b3829025

日报添加接口修正

Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx ... b8b1ebd3cf

# Conflicts:
#	src/main/java/com/jsl/oa/config/startup/PermissionList.java

feat：日报模块 修改日报接口 3f715f50a3

fix:日报模块 查询接口修正 ... 9ab6d1621b

增加部分属性

fix:日报模块 查询接口修正 ... 1b6ea7b140

xml文件修改

Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx 27268b5f3a

patch:补丁 ... 0719ecf538

对提出的问题进行修正

XiaoLFeng merged commit cd97498b80 into develop 2024-04-19 22:41:30 +08:00

XiaoLFeng referenced this issue from a commit 2024-04-19 22:41:31 +08:00

Merge pull request 'feature-zrx' (#32) from feature-zrx into develop

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

362612387 Jenkins tuxiu21 weiduidui XCYH xiangZr-hhh XiaoLFeng yangna_guji yannqing

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: WxxyDeveloper/JSL_OrganizeInternalOA#32

No description provided.