Commit Graph

153 Commits

Author SHA1 Message Date
lxj
f2a1bdc0bf 页面修改 2025-06-26 22:01:48 +08:00
dy
bea34b0999 处理新增保洁订单的问题 2025-06-26 21:59:39 +08:00
dy
7bd6aa9977 处理新增保洁订单的问题 2025-06-26 21:59:24 +08:00
dy
850b312820 修改nacos配置问题
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m39s
2025-06-26 18:16:14 +08:00
dy
72664a2966 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m14s
2025-06-26 17:33:38 +08:00
lxj
a1f4f0a112 修改保洁订单字段问题 2025-06-26 17:33:17 +08:00
a585a1be26 Merge remote-tracking branch 'origin/master'
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m10s
2025-06-26 17:16:00 +08:00
3100f8f54d feat(sis):
- 新增设备管理功能
- 添加设备与门禁的关联关系处理
2025-06-26 17:15:43 +08:00
lxj
0f382df17d Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m59s
2025-06-26 16:11:38 +08:00
lxj
d624566f7a 增加单元表 和 房间表 2025-06-26 16:11:24 +08:00
0cfdac1bae 更新 .gitea/workflows/dev.yml
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-06-26 14:02:17 +08:00
707ec002b2 更新 .gitea/workflows/dev.yml
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m54s
2025-06-26 13:18:14 +08:00
bbb080c7f1 更新 .gitea/workflows/dev.yml 2025-06-26 13:18:00 +08:00
a96dee495d 更新 .gitea/workflows/dev.yml 2025-06-26 13:16:19 +08:00
4a2afa22d5 更新 .gitea/workflows/dev.yml 2025-06-26 13:16:04 +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
lxj
4ba65e1034 Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 5m31s
2025-06-25 18:24:46 +08:00
lxj
d1de4bf845 添加SisDevicePointServiceImpl 2025-06-25 18:22:08 +08:00
lxj
6b6968994d 删除dimp-wy-web 2025-06-25 18:20:44 +08:00
lxj
6452e85012 删除dimp-wy-web 2025-06-25 18:20:40 +08:00
44f102823c feat(sis): 凭证控制相关功能
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10m8s
2025-06-25 18:08:08 +08:00
98bfc7835d Merge remote-tracking branch 'origin/master' 2025-06-25 18:06:11 +08:00
lxj
1fbef5386e Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 5m46s
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java
2025-06-25 18:04:41 +08:00
lxj
3fb9a76876 增加人像库 2025-06-25 18:04:09 +08:00
7903749a8d Merge remote-tracking branch 'origin/master' 2025-06-25 18:04:06 +08:00
ee1896e59b feat(sis): 凭证控制相关功能 2025-06-25 18:03:52 +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
8f523d7b16 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-06-25 17:36:36 +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
4e91acbe37 Merge remote-tracking branch 'origin/master'
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m44s
2025-06-25 17:04:40 +08:00
42c615a187 feat(sis): 凭证控制相关功能 2025-06-25 17:04:13 +08:00
dy
f615486c55 区域组管理实现 2025-06-25 17:03:05 +08:00
d81564f435 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m38s
2025-06-25 16:20:22 +08:00
bbbc2a3dc2 cicd 2025-06-25 16:19:54 +08:00
d5981b0d4a feat(sis): 新增凭证控制相关功能
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m52s
- 新增发行凭证、批量发行凭证、操作凭证、换卡补卡、注销人员凭证等功能
- 实现凭证控制相关的API接口和控制器
2025-06-25 15:41:32 +08:00
bd3ab40be6 E8门禁业务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m18s
2025-06-25 12:54:08 +08:00
1a2524ce15 Merge remote-tracking branch 'origin/master'
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-06-25 12:50:00 +08:00
lxj
84efbe0e11 E8门禁业务 2025-06-25 12:47:23 +08:00
lxj
6de67e1956 Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m7s
2025-06-25 12:22:51 +08:00
lxj
71ba316e91 增加门禁设备管理 2025-06-25 12:21:11 +08:00
5603edb1fc Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 9m7s
2025-06-25 11:40:34 +08:00
7e60d2a3cc 资产审批 2025-06-25 11:40:21 +08:00
lxj
d8d01b7d38 修改mapper 包名
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 8m15s
2025-06-25 10:25:15 +08:00
9b4fafeec2 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 8m6s
2025-06-25 09:26:39 +08:00
e5145002a4 asset模块 2025-06-25 09:26:28 +08:00
15683799673
27425e32af 1 增加人像库等操作
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m26s
2 修改包名称
2025-06-25 00:40:14 +08:00
15683799673
35cbd74b39 1 增加人像库等操作
2 修改包名称
2025-06-25 00:38:53 +08:00
15683799673
1a51f90731 E8服务合并到安放模块
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m49s
2025-06-24 22:06:47 +08:00