develop #1

Merged

zsq merged 17 commits from develop into main 2026-01-25 11:14:49 +08:00

Conversation 0 Commits 17 Files Changed 409 +7843 -34470

zsq commented 2026-01-25 11:14:41 +08:00

Owner

Copy Link

No description provided.

zsq added 17 commits 2026-01-25 11:14:42 +08:00

fix1:1 f63df9ef93

fix：更新 4c249b98bd

Merge branch 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-company into develop ... 2f9dd387ff

* 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-company:
  fix1:1

# Conflicts:
#	src/gen/ApiTypes.d.ts
#	src/gen/Enums.ts

fix：2 50ef72bc80

fix:更新账单 b66917f999

fix：更新 5848304307

fix：3 9752a8be88

Merge branch 'develop' of https://code.linyikj.com.cn/pay/pay-company into develop ... 87e4ed194d

# Conflicts:
#	src/gen/Enums.ts
#	src/pages/bills/house_bills/index.tsx

fix：更新logo e8ff9809df

Merge branch 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-company into develop ... 1bab84238a

* 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-company:
  fix：3

fix：活动、组织、放行 555301527b

fix：增加审批，退款 2699402b7a

Merge branch 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-company into develop ... ae327d9b56

* 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-company:
  fix：活动、组织、放行

# Conflicts:
#	src/gen/Enums.ts

fix:更新优化 1152ae3ec9

fix：更新优化 040804697d

fix：更新 176bdc01f5

fix：更新修改 4ab3633afb

zsq merged commit d7f5e9b00e into main 2026-01-25 11:14:49 +08:00

zsq referenced this issue from a commit 2026-01-25 11:14:50 +08:00

Merge pull request 'develop' (#1) from develop into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

kelvin uiujun yangting zsq

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pay/pay-company#1

No description provided.