pay/pay-employee
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #1

Merged
zsq merged 4 commits from develop into main 2026-01-30 10:02:06 +08:00
Conversation 0 Commits 4 Files Changed 761 +14780 -1847
zsq commented 2026-01-30 10:01:58 +08:00
Owner
Copy Link
No description provided.
zsq added 4 commits 2026-01-30 10:01:59 +08:00 
* 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-employee:
  fix：更新

# Conflicts:
#	.env.development
#	ci/project.config.json
#	dist/build/mp-weixin/BILL/outstanding_fee/components/HeadSearchBtn.js
#	dist/build/mp-weixin/BILL/outstanding_fee/components/HeaderSearch.js
#	dist/build/mp-weixin/BILL/outstanding_fee/index/index.js
#	dist/build/mp-weixin/BILL/outstanding_fee/index/index.json
#	dist/build/mp-weixin/BILL/outstanding_fee/index/index.wxml
#	dist/build/mp-weixin/BILL/outstanding_fee/index/index.wxss
#	dist/build/mp-weixin/BILL/poster/method.js
#	dist/build/mp-weixin/ME/push_show/index.js
#	dist/build/mp-weixin/ME/push_show/index.wxml
#	dist/build/mp-weixin/ME/push_show/index.wxss
#	dist/build/mp-weixin/WORKORDER/add/index.js
#	dist/build/mp-weixin/WORKORDER/add/index.json
#	dist/build/mp-weixin/WORKORDER/add/index.wxml
#	dist/build/mp-weixin/WORKORDER/add/index.wxss
#	dist/build/mp-weixin/WORKORDER/add/method.js
#	dist/build/mp-weixin/WORKORDER/list/index.js
#	dist/build/mp-weixin/WORKORDER/list/index.json
#	dist/build/mp-weixin/WORKORDER/list/index.wxml
#	dist/build/mp-weixin/WORKORDER/list/index.wxss
#	dist/build/mp-weixin/WORKORDER/list/method.js
#	dist/build/mp-weixin/WORKORDER/list/model.js
#	dist/build/mp-weixin/WORKORDER/show/index.js
#	dist/build/mp-weixin/WORKORDER/show/index.json
#	dist/build/mp-weixin/WORKORDER/show/index.wxml
#	dist/build/mp-weixin/WORKORDER/show/index.wxss
#	dist/build/mp-weixin/WORKORDER/show/method.js
#	dist/build/mp-weixin/WORKORDER/update/index.js
#	dist/build/mp-weixin/WORKORDER/update/index.json
#	dist/build/mp-weixin/WORKORDER/update/index.wxml
#	dist/build/mp-weixin/WORKORDER/update/method.js
#	dist/build/mp-weixin/WORKORDER/update/model.js
#	dist/build/mp-weixin/app.json
#	dist/build/mp-weixin/common/libraries/day.js
#	dist/build/mp-weixin/common/libraries/sendWxWork.js
#	dist/build/mp-weixin/common/vendor.js
#	dist/build/mp-weixin/components/hs-button/hs-button.js
#	dist/build/mp-weixin/components/hs-button/hs-button.wxml
#	dist/build/mp-weixin/components/hs-button/hs-button.wxss
#	dist/build/mp-weixin/components/hs-footer/hs-footer.js
#	dist/build/mp-weixin/components/hs-footer/hs-footer.wxml
#	dist/build/mp-weixin/components/hs-footer/hs-footer.wxss
#	dist/build/mp-weixin/components/hs-popup/hs-popup.js
#	dist/build/mp-weixin/components/hs-popup/hs-popup.wxml
#	dist/build/mp-weixin/components/hs-popup/hs-popup.wxss
#	dist/build/mp-weixin/components/hs-radio/hs-radio.js
#	dist/build/mp-weixin/components/hs-radio/hs-radio.wxml
#	dist/build/mp-weixin/components/hs-radio/hs-radio.wxss
#	dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.js
#	dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxml
#	dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxss
#	dist/build/mp-weixin/gen/Apis.js
#	dist/build/mp-weixin/gen/Enums.js
#	dist/build/mp-weixin/node-modules/uview-plus/components/u-badge/u-badge.js
#	dist/build/mp-weixin/node-modules/uview-plus/components/u-button/u-button.js
#	dist/build/mp-weixin/node-modules/uview-plus/components/u-link/u-link.js
#	dist/build/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js
#	dist/build/mp-weixin/pages/index/components/Classification.js
#	dist/build/mp-weixin/pages/index/components/Classification.wxml
#	dist/build/mp-weixin/pages/index/components/Classification.wxss
#	dist/build/mp-weixin/pages/index/components/ShowData.js
#	dist/build/mp-weixin/pages/index/components/ShowData.wxml
#	dist/build/mp-weixin/pages/index/components/ShowData.wxss
#	dist/build/mp-weixin/pages/index/components/TemplateMomentTask.js
#	dist/build/mp-weixin/pages/index/components/TemplateMomentTask.json
#	dist/build/mp-weixin/pages/index/components/TemplateMomentTask.wxml
#	dist/build/mp-weixin/pages/index/components/TemplateMomentTask.wxss
#	dist/build/mp-weixin/pages/index/index.wxss
#	dist/build/mp-weixin/pages/index/method.js
#	dist/dev/mp-weixin/BILL/outstanding_fee/index/index.js
#	dist/dev/mp-weixin/BILL/outstanding_fee/index/index.json
#	dist/dev/mp-weixin/BILL/outstanding_fee/index/index.wxml
#	dist/dev/mp-weixin/BILL/outstanding_fee/index/index.wxss
#	dist/dev/mp-weixin/BILL/poster/method.js
#	dist/dev/mp-weixin/WORKORDER/add/index.js
#	dist/dev/mp-weixin/WORKORDER/add/index.json
#	dist/dev/mp-weixin/WORKORDER/add/index.wxml
#	dist/dev/mp-weixin/WORKORDER/add/index.wxss
#	dist/dev/mp-weixin/WORKORDER/add/method.js
#	dist/dev/mp-weixin/WORKORDER/list/index.js
#	dist/dev/mp-weixin/WORKORDER/list/index.json
#	dist/dev/mp-weixin/WORKORDER/list/index.wxml
#	dist/dev/mp-weixin/WORKORDER/list/index.wxss
#	dist/dev/mp-weixin/WORKORDER/list/method.js
#	dist/dev/mp-weixin/WORKORDER/list/model.js
#	dist/dev/mp-weixin/WORKORDER/show/index.js
#	dist/dev/mp-weixin/WORKORDER/show/index.json
#	dist/dev/mp-weixin/WORKORDER/show/index.wxml
#	dist/dev/mp-weixin/WORKORDER/show/index.wxss
#	dist/dev/mp-weixin/WORKORDER/show/method.js
#	dist/dev/mp-weixin/WORKORDER/update/index.js
#	dist/dev/mp-weixin/WORKORDER/update/index.json
#	dist/dev/mp-weixin/WORKORDER/update/index.wxml
#	dist/dev/mp-weixin/WORKORDER/update/method.js
#	dist/dev/mp-weixin/WORKORDER/update/model.js
#	dist/dev/mp-weixin/app.js
#	dist/dev/mp-weixin/app.json
#	dist/dev/mp-weixin/common/libraries/day.js
#	dist/dev/mp-weixin/common/libraries/request.js
#	dist/dev/mp-weixin/common/vendor.js
#	dist/dev/mp-weixin/components/hs-popup/hs-popup.wxml
#	dist/dev/mp-weixin/components/hs-popup/hs-popup.wxss
#	dist/dev/mp-weixin/components/hs-radio/hs-radio.wxss
#	dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.js
#	dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxss
#	dist/dev/mp-weixin/gen/Apis.js
#	dist/dev/mp-weixin/gen/Enums.js
#	dist/dev/mp-weixin/node-modules/uview-plus/components/u-badge/u-badge.js
#	dist/dev/mp-weixin/node-modules/uview-plus/components/u-button/u-button.js
#	dist/dev/mp-weixin/node-modules/uview-plus/components/u-link/u-link.js
#	dist/dev/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js
#	dist/dev/mp-weixin/pages/index/components/Classification.js
#	dist/dev/mp-weixin/pages/index/components/ShowData.wxml
#	dist/dev/mp-weixin/pages/index/index.wxss
#	src/BILL/outstanding_fee/index/index.vue
#	src/BILL/outstanding_fee/index/style.scss
#	src/BILL/poster/method.ts
#	src/WORKORDER/add/index.vue
#	src/WORKORDER/add/method.ts
#	src/WORKORDER/add/style.scss
#	src/WORKORDER/list/index.vue
#	src/WORKORDER/list/method.ts
#	src/WORKORDER/list/model.ts
#	src/WORKORDER/list/style.scss
#	src/WORKORDER/show/index.vue
#	src/WORKORDER/show/method.ts
#	src/WORKORDER/show/style.scss
#	src/WORKORDER/update/index.vue
#	src/WORKORDER/update/method.ts
#	src/WORKORDER/update/model.ts
#	src/common/libraries/day.ts
#	src/components/hs-reservation-picker/hs-reservation-picker.vue
#	src/gen/ApiTypes.d.ts
#	src/gen/Apis.ts
#	src/gen/Enums.ts
#	src/pages.json
#	src/pages/index/components/Classification.vue
#	src/pages/index/components/ShowData.vue
#	src/pages/index/style.scss
zsq merged commit 7455776d70 into main 2026-01-30 10:02:06 +08:00
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
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: pay/pay-employee#1
No description provided.
Delete Branch "develop"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?