Commit Graph

177 Commits

Author SHA1 Message Date
wangwenhua
0cac31d7c0 设置全局scenario值 2025-09-21 09:34:21 +08:00
wangwenhua
6304f2a9c2 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/com/hivekion/room/bean/BattleRootTask.java
2025-09-21 06:25:10 +08:00
wangwenhua
dbd27f27e0 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
 Conflicts:
	src/main/java/com/hivekion/room/bean/BattleRootTask.java
2025-09-21 06:24:50 +08:00
李玉东
fb926dc7a6 任务相关 2025-09-21 06:24:08 +08:00
wangwenhua
a2d687beb1 设置全局scenario值 2025-09-21 06:23:47 +08:00
李玉东
92f0b52980 任务相关 2025-09-21 05:40:40 +08:00
李玉东
9f9cb97cbc 任务相关 2025-09-21 04:31:48 +08:00
wangwenhua
98276fd4d9 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-21 03:49:35 +08:00
wangwenhua
4b2b3324eb 设置全局scenario值 2025-09-21 03:49:30 +08:00
wangwenhua
3fa7529f8e 设置全局scenario值 2025-09-21 03:48:48 +08:00
李玉东
ab69a278a4 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-21 02:51:16 +08:00
李玉东
dc3c091a7c 任务相关 2025-09-21 02:50:53 +08:00
wangwenhua
c5e33a4d42 设置全局scenario值 2025-09-21 02:45:37 +08:00
wangwenhua
357bb500f2 设置全局scenario值 2025-09-21 02:42:11 +08:00
wangwenhua
d0789c5a7c 设置全局scenario值 2025-09-21 02:24:52 +08:00
李玉东
7859078d72 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
# Conflicts:
#	src/main/java/com/hivekion/room/bean/MoveTask.java
2025-09-21 02:22:12 +08:00
李玉东
ddf9e082f2 任务相关 2025-09-21 02:21:29 +08:00
wangwenhua
a77604cf89 设置全局scenario值 2025-09-21 02:14:06 +08:00
李玉东
e636f7d248 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-21 01:53:59 +08:00
李玉东
2d218d905c 任务相关 2025-09-21 01:53:44 +08:00
wangwenhua
4dafe34ec4 Merge remote-tracking branch 'origin/main' 2025-09-21 01:25:03 +08:00
wangwenhua
13a6d67e65 设置全局scenario值 2025-09-21 01:23:39 +08:00
李玉东
4d1c4b56d1 任务相关 2025-09-21 00:26:28 +08:00
李玉东
c5f5136314 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-20 22:23:53 +08:00
wangwenhua
d770ac1a39 设置全局scenario值 2025-09-20 22:22:25 +08:00
李玉东
8e9fd3537d Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-20 22:06:35 +08:00
李玉东
5f7684698e 任务相关 2025-09-20 22:06:03 +08:00
李玉东
ff809b56ee 任务相关 2025-09-20 22:01:08 +08:00
wangwenhua
ac0f3caa79 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-20 21:56:47 +08:00
wangwenhua
be0d17a242 设置全局scenario值 2025-09-20 21:56:39 +08:00
李玉东
25507ce2aa 任务相关 2025-09-20 21:51:45 +08:00
李玉东
35995ce8ff 任务相关 2025-09-20 20:14:26 +08:00
李玉东
50395edce4 任务相关 2025-09-20 18:28:11 +08:00
李玉东
aef2cb7771 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-20 18:21:24 +08:00
李玉东
b83d98c178 任务相关 2025-09-20 18:21:04 +08:00
wangwenhua
3330180a8a 设置全局scenario值 2025-09-20 17:55:00 +08:00
wangwenhua
b1d913698d Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
 Conflicts:
	src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java
2025-09-20 17:17:40 +08:00
wangwenhua
a5b56ac249 设置全局scenario值 2025-09-20 17:16:00 +08:00
李玉东
4d5cc0489c 任务相关 2025-09-20 17:14:47 +08:00
李玉东
e0dc6d32f8 任务相关 2025-09-20 16:12:21 +08:00
李玉东
f59eabb06f Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-20 15:58:04 +08:00
李玉东
2e303227c3 任务相关 2025-09-20 15:57:25 +08:00
wangwenhua
8d31f6fdd1 Merge remote-tracking branch 'origin/main' 2025-09-20 15:56:39 +08:00
wangwenhua
17ce8ecebd 设置全局scenario值 2025-09-20 15:56:14 +08:00
李玉东
9862c48de3 任务相关 2025-09-20 15:55:00 +08:00
李玉东
f070c479a7 任务相关 2025-09-20 15:53:49 +08:00
李玉东
f5ba96e225 任务相关 2025-09-20 15:48:14 +08:00
李玉东
d7dc7d6110 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
# Conflicts:
#	src/main/java/com/hivekion/room/bean/AbtParentTask.java
#	src/main/java/com/hivekion/room/bean/Room.java
2025-09-20 15:08:20 +08:00
wangwenhua
6f2cef9edc 设置全局scenario值 2025-09-20 15:07:48 +08:00
李玉东
179c28020b 任务相关 2025-09-20 15:07:45 +08:00