Commit Graph

125 Commits

Author SHA1 Message Date
f69326343e 修改了会议预约bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
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
5b45214bbe Merge remote-tracking branch 'origin/master' 2025-07-05 11:49:09 +08:00
20f6cc8541 refactor(sis): base64指定格式JPG 2025-07-05 11:48:57 +08:00
d09c0c7df8 新增会议室设置和会议室增值服务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 4m11s
2025-07-05 11:07:04 +08:00
9217befba8 refactor(sis): 1
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m43s
2025-07-05 10:07:46 +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
lxj
84de853d7c 人脸远程报警完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 17:54:54 +08:00
d300606070 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 11:41:24 +08:00
bb94581a59 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 11:20:59 +08:00
6029392c7a refactor(sis): 将E8门禁设备 ID 类型从 Integer改为 Long 2025-07-02 11:20:35 +08:00
dy
3ff380ab50 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 10:39:47 +08:00
dy
ba5225f4c7 1 2025-07-02 10:39:36 +08:00
a065d72724 refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- E8平台授权逻辑调整
2025-07-01 21:17:22 +08:00
baf9502b61 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 17:12:41 +08:00
9a1a87800f feat(sis):
- 图像库图片改为通过ossId获取
- SisPersonLibImg 字段 imgUrl 更改为 imgOssId,类型同步更改
- 移除SisDeviceManage 中的 accessControlId 字段
2025-07-01 17:10:04 +08:00
dy
5ed4796d3c Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-01 15:13:48 +08:00
dy
2a2b400760 保洁逻辑修改 2025-07-01 15:13:38 +08:00
15683799673
d2638de4e4 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 08:46:07 +08:00
15683799673
b70c3f2ee1 增加门禁查询树接口 2025-07-01 08:45:45 +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
75cc08fa99 驼峰变动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 10:13:07 +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
116abb4113 refactor(sis): E8授权逻辑更改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 17:17:02 +08:00
abeac0c7c7 refactor(sis): 优化授权
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 16:19:26 +08:00
39f35fe58b feat(sis): 添加 E8平台对应关系模块
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 11:49:31 +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
873cf303c2 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人像授权
 - 上传图片简化
2025-06-28 13:42:09 +08:00
3560c80c41 feat(sis):
- 修改人像图片
2025-06-28 10:23:42 +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