Commit Graph

227 Commits

Author SHA1 Message Date
wangwenhua
897f2ecc82 战斗任务消耗资源代码 2025-09-18 21:03:36 +08:00
wangwenhua
b6dde358d4 战斗任务消耗资源代码 2025-09-18 17:30:12 +08:00
wangwenhua
5ece6ee204 战斗任务消耗资源代码 2025-09-18 16:19:42 +08:00
wangwenhua
dcbe07e3d5 战斗任务消耗资源代码 2025-09-18 15:23:09 +08:00
李玉东
b03c0bcf23 任务相关 2025-09-18 14:10:33 +08:00
李玉东
84256158c3 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-18 13:52:21 +08:00
李玉东
1fc63d734b 任务相关 2025-09-18 13:51:58 +08:00
6dc71feb6d Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend into main 2025-09-18 13:33:37 +08:00
wangwenhua
2b9d599b85 Merge remote-tracking branch 'origin/main' 2025-09-18 13:26:47 +08:00
wangwenhua
f3f947e57b 新代码 2025-09-18 13:26:34 +08:00
李玉东
dc6f239a8d 任务相关 2025-09-18 11:43:14 +08:00
李玉东
b8b67c1d3e 任务相关 2025-09-18 11:41:46 +08:00
李玉东
3f1fd98f42 任务相关 2025-09-18 11:38:15 +08:00
wangwenhua
1d87663752 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
 Conflicts:
	src/main/java/com/hivekion/CodeGenerator.java
	src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java
2025-09-18 11:37:43 +08:00
wangwenhua
ac0a950025 新代码 2025-09-18 11:34:34 +08:00
李玉东
5bb5ea1aa5 任务相关 2025-09-18 11:31:16 +08:00
b6c1239717 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend into main 2025-09-18 11:23:58 +08:00
李玉东
76371d641c 任务相关 2025-09-18 11:20:55 +08:00
李玉东
b6bc87ffab 任务相关 2025-09-18 10:47:37 +08:00
40974c395f 增加需求状态和任务状态枚举类型数据 2025-09-17 22:02:16 +08:00
李玉东
720748ea1e 初次提交 2025-09-17 15:30:46 +08:00
李玉东
ad420b3e8c Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-17 14:59:58 +08:00
李玉东
85435894fa 初次提交 2025-09-17 14:59:08 +08:00
李玉东
9338afe26d 初次提交 2025-09-17 13:58:20 +08:00
wangwenhua
92a383a9b3 装备分类中实现车辆分类,车辆类型维护的增删改查 2025-09-16 20:07:35 +08:00
wangwenhua
1557fd9e35 修复装备分类树状显示bug
装备分类中显示医院,仓库
2025-09-16 09:31:24 +08:00
李玉东
ba59c13054 初次提交 2025-09-15 08:50:32 +08:00
李玉东
08ee625021 初次提交 2025-09-15 00:45:00 +08:00
李玉东
3dab4b367f Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-15 00:36:25 +08:00
李玉东
59b129c064 初次提交 2025-09-15 00:36:13 +08:00
wangwenhua
afd861e39d 医院,仓库查询代码 2025-09-15 00:35:19 +08:00
李玉东
69c1797c1f Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
# Conflicts:
#	src/main/resources/mapper/tbl/ScenarioMapper.xml
2025-09-14 23:51:56 +08:00
李玉东
4fb146c25c 初次提交 2025-09-14 23:51:40 +08:00
wangwenhua
36b0878659 发送天气资源消息 2025-09-14 23:50:40 +08:00
李玉东
11ced2acf4 初次提交 2025-09-14 23:32:48 +08:00
wangwenhua
737eebbf4e Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
 Conflicts:
	src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java
2025-09-14 23:15:09 +08:00
wangwenhua
3adfc9d456 发送天气资源消息 2025-09-14 23:10:15 +08:00
李玉东
68c3ac98b8 初次提交 2025-09-14 23:08:37 +08:00
李玉东
0601bc932a 初次提交 2025-09-14 22:48:02 +08:00
李玉东
01007c1279 初次提交 2025-09-14 22:34:55 +08:00
李玉东
2f40a8556c 初次提交 2025-09-14 21:56:23 +08:00
wangwenhua
1525954f1a Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-14 18:34:57 +08:00
wangwenhua
7bda68fcab 发送天气资源消息 2025-09-14 18:33:09 +08:00
李玉东
6a50a67bab 初次提交 2025-09-14 18:28:51 +08:00
李玉东
8a67a6366e 初次提交 2025-09-14 18:27:23 +08:00
李玉东
203139a7eb 初次提交 2025-09-14 18:25:11 +08:00
李玉东
8012dca7bb Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-14 18:02:15 +08:00
李玉东
8422b7e13d 初次提交 2025-09-14 18:01:52 +08:00
wangwenhua
31cad54e46 Merge remote-tracking branch 'origin/main' 2025-09-14 17:51:29 +08:00
wangwenhua
79b353760d 修改类型 2025-09-14 17:50:46 +08:00