Commit Graph

48 Commits

Author SHA1 Message Date
fyy
c8b6d2faba feat: 修复保洁、绿植、园区、系统用户相关bug 2025-07-14 11:53:18 +08:00
fyy
b44caa166a fix: 修复保洁绿植bug 2025-07-11 11:37:04 +08:00
fyy
031c744877 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 17:54:32 +08:00
fyy
b1d0c117fc feat: 接入大屏修复bug 2025-07-10 17:52:54 +08:00
FLL
2cd8d752eb Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# Conflicts:
#	apps/web-antd/vite.config.mts
2025-07-10 16:21:36 +08:00
FLL
f642b56e55 预约记录 2025-07-10 16:20:21 +08:00
fyy
0d2a4db6a6 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 18:20:21 +08:00
fyy
d8174111c2 feat: 会议室查看 2025-07-09 18:18:48 +08:00
b1265fb00c 1、会议室设置
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10s
2025-07-07 17:30:51 +08:00
fyy
38012ccdb1 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m42s
2025-07-07 14:38:31 +08:00
fyy
9ab72435c7 feat: 绿植租赁方案添加产品数量 2025-07-07 14:38:01 +08:00
FLL
171d3ef133 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 3m1s
2025-07-05 17:47:36 +08:00
FLL
1d7fbf78b6 会议管理 2025-07-05 17:47:26 +08:00
50bc728ffb 1、租赁订单详情
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-05 17:42:37 +08:00
FLL
ddf8251ce8 会议管理 2025-07-05 11:43:25 +08:00
FLL
06c625fa76 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-07-05 09:59:33 +08:00
FLL
5e050a381c 会议管理 2025-07-05 09:59:25 +08:00
fyy
f5d7d70cc2 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 8s
2025-07-05 09:11:56 +08:00
fyy
3031809692 feat: 合并代码 2025-07-05 09:11:29 +08:00
0d5b964596 1、租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-04 17:58:09 +08:00
FLL
e28ddabf57 会议管理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-04 17:56:14 +08:00
FLL
e21c76cc6f Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-03 17:49:34 +08:00
FLL
3827a13cbd 会议管理 2025-07-03 17:49:23 +08:00
73b2d27fa6 1、租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 18:00:26 +08:00
FLL
4bf741f63d Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 17:56:15 +08:00
FLL
4b3d075266 绿植管理 2025-07-02 17:56:04 +08:00
fyy
63c3a8b550 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 14:43:17 +08:00
fyy
d3033eb12d feat: 绿植租赁方案对接完成 2025-07-02 14:42:17 +08:00
FLL
44b91fc587 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# Conflicts:
#	apps/web-antd/vite.config.mts
2025-07-02 11:04:00 +08:00
FLL
79fe4c6412 绿植管理 2025-07-02 11:02:14 +08:00
cfa85a864c 1、租赁订单管理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 17:57:12 +08:00
fyy
33f2197ea8 feat: 构架绿植租赁方案管理页面
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 17:48:47 +08:00
40845f90aa 1、绿植租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 18:11:49 +08:00
FLL
86e928430a Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 17:58:46 +08:00
FLL
19f8c57e23 访客管理 2025-06-30 17:58:33 +08:00
fyy
bbb3c52af4 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 17:44:09 +08:00
fyy
fa3c442545 feat: 测试保洁订单 2025-06-30 17:42:56 +08:00
9eac725934 1、绿植租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 14:45:06 +08:00
fyy
3e8ba86305 feat: 保洁接口对接
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 18:03:13 +08:00
FLL
4819f881ed 收费管理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 15:55:02 +08:00
6f2e0be983 1、单元
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 7m16s
2、房间
2025-06-26 18:04:51 +08:00
fyy
e06f8861cc Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-06-26 18:03:07 +08:00
fyy
730d8ca6f2 feat: 更新保洁页面 2025-06-26 18:02:43 +08:00
FLL
8ecf6b03aa 小区,建筑,楼层
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-06-26 17:59:00 +08:00
FLL
2b10dc8fa2 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 6m0s
# Conflicts:
#	apps/web-antd/vite.config.mts
2025-06-26 09:51:51 +08:00
FLL
8d3f5331a5 产品管理 2025-06-26 09:50:41 +08:00
fyy
b5c47bc3f9 feat: 初始化绿植养护租赁管理页面 2025-06-26 09:33:34 +08:00
fyy
1c3016c44b feat: 新增绿植租赁管理菜单 2025-06-25 11:17:58 +08:00