10 Commits

Author SHA1 Message Date
zsq
7455776d70 Merge pull request 'develop' (#1) from develop into main
Reviewed-on: #1
2026-01-30 10:02:05 +08:00
Your Name
6de9094605 fix:最新版本 2026-01-30 09:54:46 +08:00
Your Name
8ba9d9ae86 fix:更新 2025-12-19 09:46:56 +08:00
Your Name
94d5d04457 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-employee into develop
* '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
2025-12-15 18:39:29 +08:00
Your Name
6551f9fdb4 fix:更新初始化 2025-12-15 18:27:46 +08:00
Your Name
de0e6deb3b fix:更新 2025-10-29 13:53:24 +08:00
4ab85b16d7 feat:初始化 2025-07-16 09:34:46 +08:00
aa26889f03 fix:更新 2025-07-09 00:34:00 +08:00
f231f64c1d 初始化 2025-07-08 16:49:39 +08:00
b48337a67d first commit 2025-07-08 15:33:49 +08:00