Commit Graph

59 Commits

Author SHA1 Message Date
f69326343e 修改了会议预约bug
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 8m37s
2025-07-08 16:13:56 +08:00
c49bb4cdb3 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-08 16:08:38 +08:00
bb98a34fa6 1、 2025-07-08 16:08:19 +08:00
ba9202e6ca 修改了会议设置bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 13m8s
2025-07-07 17:30:03 +08:00
7dc0a87a23 修改了会议设置bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10s
2025-07-07 17:20:28 +08:00
dy
1ca5352a9d Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 13m54s
2025-07-07 15:27:33 +08:00
dy
a349719de9 解决总价不能上传的问题 2025-07-07 15:27:21 +08:00
7b40b084c1 1、绿植统计下单客户总数
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m42s
2025-07-07 14:16:01 +08:00
9a34602030 1、租赁订单
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 22m59s
2025-07-05 17:38:27 +08:00
73b4581836 新增支付状态枚举接口
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-05 15:54:34 +08:00
322a9944e8 新增支付状态枚举接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-05 15:45:50 +08:00
487480c0e1 更新 ruoyi-modules/Property/Dockerfile
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 38s
2025-07-05 14:25:46 +08:00
d09c0c7df8 新增会议室设置和会议室增值服务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 4m11s
2025-07-05 11:07:04 +08:00
2c6733d1ea 上传文件至 ruoyi-modules/Property
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10m27s
2025-07-04 18:03:29 +08:00
014a157921 1、绿植租赁统计
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-04 17:59:19 +08:00
79d55e458f 新增会议室设置和会议室增值服务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m43s
2025-07-04 14:57:15 +08:00
dy
398e19f2f7 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-03 12:05:10 +08:00
dy
4a20ec11db 保洁订单详情 2025-07-03 12:04:51 +08:00
dy
147c67b5ad 保洁订单详情 2025-07-03 09:36:04 +08:00
9a8ccb1f57 1、租赁订单统计
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-02 17:58:52 +08:00
dy
ba5225f4c7 1 2025-07-02 10:39:36 +08:00
dy
2a2b400760 保洁逻辑修改 2025-07-01 15:13:38 +08:00
dy
1b158eb6ae Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
# Conflicts:
#	ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java
2025-06-30 20:09:22 +08:00
dy
b8ccb255d5 保洁查询和新增的问题 2025-06-30 20:05:58 +08:00
dy
7c95a690ea 保洁查询和新增的问题 2025-06-30 20:00:07 +08:00
86503753bb 1、绿植租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2、绿植租赁收费
3、绿植租赁订单养护
2025-06-30 17:21:30 +08:00
15683799673
3837c2f2ef 增加门禁授权
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 06:17:21 +08:00
15683799673
8b065703cd 增加门禁设备
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 02:59:43 +08:00
15683799673
6b1e9253af 综合管理模块完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 22:48:11 +08:00
15683799673
62b1e1b803 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 02:41:55 +08:00
15683799673
7216b08530 人像库页面以及后端完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 22:18:14 +08:00
15683799673
e55ecffb98 java 实体类型long改int
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 20:28:33 +08:00
dy
0e8cb20ffd 修改区域查询和新增保洁管理的问题 2025-06-27 17:42:40 +08:00
dy
c7446fde32 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m55s
2025-06-27 09:20:07 +08:00
lxj
eba821a141 Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 8m34s
2025-06-26 22:02:09 +08:00
lxj
f2a1bdc0bf 页面修改 2025-06-26 22:01:48 +08:00
dy
7bd6aa9977 处理新增保洁订单的问题 2025-06-26 21:59:24 +08:00
lxj
a1f4f0a112 修改保洁订单字段问题 2025-06-26 17:33:17 +08:00
lxj
d624566f7a 增加单元表 和 房间表 2025-06-26 16:11:24 +08:00
lxj
5a3ed5dd23 处理物业模块报错的问题
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m51s
2025-06-26 12:28:46 +08:00
759dd5a5af Merge remote-tracking branch 'origin/master'
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 11m20s
2025-06-25 17:51:13 +08:00
0aad306035 1、绿植租赁 2025-06-25 17:50:27 +08:00
dy
25774259b9 人员组管理实现 2025-06-25 17:36:25 +08:00
dy
2753a01842 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
# Conflicts:
#	ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
2025-06-25 17:05:04 +08:00
dy
f615486c55 区域组管理实现 2025-06-25 17:03:05 +08:00
lxj
84efbe0e11 E8门禁业务 2025-06-25 12:47:23 +08:00
lxj
71ba316e91 增加门禁设备管理 2025-06-25 12:21:11 +08:00
7e60d2a3cc 资产审批 2025-06-25 11:40:21 +08:00
e5145002a4 asset模块 2025-06-25 09:26:28 +08:00
lxj
d4927d2699 增加宇视AI盒子对接服务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m18s
iot模块修改为智能安防模块
2025-06-24 21:09:01 +08:00