129 Commits

Author SHA1 Message Date
49818c2c9f Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop 2025-07-01 16:21:32 +08:00
fda8a7bc65 fix:岗位调整 2025-07-01 16:21:27 +08:00
8c73e695e2 feat:机构员工 2025-07-01 11:35:54 +08:00
013e4d8e05 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop
# Conflicts:
#	src/pages/company/employees/index.tsx
2025-07-01 10:41:14 +08:00
ec00312701 fix;岗位 2025-07-01 10:40:00 +08:00
0c0e06bfe8 fix:搜索 2025-07-01 09:35:27 +08:00
3e0e4ed472 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop 2025-06-30 18:42:29 +08:00
3431a7da42 no message 2025-06-30 18:42:21 +08:00
84db944c19 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop
* 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin:
  no message
2025-06-30 16:07:34 +08:00
521a1f3cb4 fix:机构详情 2025-06-30 16:07:20 +08:00
1cdddded82 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop
# Conflicts:
#	src/gen/ApiTypes.d.ts
#	src/gen/Apis.ts
2025-06-30 15:57:09 +08:00
de0fc32617 no message 2025-06-30 15:56:13 +08:00
f5eaece8ab feat:组织,员工 2025-06-30 15:55:47 +08:00
a5e51a0305 fix:项目调整,机构 2025-06-30 14:25:32 +08:00
ede8af0d1f fix:更新机构 2025-06-30 14:24:39 +08:00
aafef7be31 fix:项目调整 2025-06-30 14:20:46 +08:00
5c244d1a72 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop
* 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin:
  1
2025-06-30 13:42:19 +08:00
9c93e3fbb6 fix:更新modal 2025-06-30 13:41:38 +08:00
0fcdf6e00f Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop
# Conflicts:
#	.umirc.ts
#	gencode.json
2025-06-29 23:57:51 +08:00
bae4f806bd feat:更新项目,机构,楼栋 2025-06-29 18:42:50 +08:00
2a965d5f07 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop 2025-06-27 18:08:33 +08:00
f902777f03 1 2025-06-27 18:08:27 +08:00
b5e7b330d6 fix:更新 2025-06-27 17:46:55 +08:00
d9630d65e8 fix:更新 2025-06-27 17:27:47 +08:00
13d5ca8d11 fix:更新 2025-06-27 17:16:40 +08:00
499ed1f979 fix:更新 2025-06-27 17:15:50 +08:00
d655dce836 fix:api 2025-06-27 17:03:33 +08:00
67fc8f005e feat:初始化 2025-06-27 16:42:11 +08:00
dbbfe346b3 first commit 2025-06-27 16:40:26 +08:00