Commit Graph

110 Commits

Author SHA1 Message Date
wangwenhua
6e0332f808 供应补充 2025-09-28 21:24:34 +08:00
wangwenhua
333fc7e879 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-28 16:37:47 +08:00
wangwenhua
7f0547e2a0 第三方登录 2025-09-28 16:37:12 +08:00
李玉东
40b5173b18 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
# Conflicts:
#	src/main/java/com/hivekion/room/bean/BattleRootTask.java
2025-09-28 14:43:51 +08:00
李玉东
96abc0ddef 任务相关 2025-09-28 14:43:18 +08:00
577f639d60 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-28 09:31:42 +08:00
0c226aa93e 修改医疗保障分类 2025-09-22 22:20:39 +08:00
李玉东
5d0a37b49a 任务相关 2025-09-22 22:17:55 +08:00
wangwenhua
18392d6961 Merge remote-tracking branch 'origin/main' 2025-09-22 18:24:01 +08:00
wangwenhua
4499b58606 修改bug 2025-09-22 18:23:37 +08:00
李玉东
d1d2d52d19 任务相关 2025-09-22 17:17:06 +08:00
李玉东
79850327fb 任务相关 2025-09-22 17:09:53 +08:00
李玉东
3c8b8a5ce6 任务相关 2025-09-22 16:32:58 +08:00
wangwenhua
6334c44e35 修改bug 2025-09-22 15:01:09 +08:00
wangwenhua
baa1a1f1c6 修改bug 2025-09-22 14:46:46 +08:00
wangwenhua
ffdbe33632 修改bug 2025-09-22 14:23:58 +08:00
wangwenhua
ee75390dd6 修改bug 2025-09-22 14:17:49 +08:00
wangwenhua
cd76249853 修改bug 2025-09-22 10:30:05 +08:00
wangwenhua
982a8cd2f7 天气 2025-09-21 12:51:11 +08:00
wangwenhua
ffdcf16683 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-21 09:34:31 +08:00
wangwenhua
0cac31d7c0 设置全局scenario值 2025-09-21 09:34:21 +08:00
李玉东
8d1d5c1f74 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-21 07:58:22 +08:00
李玉东
ee505e3fb0 任务相关 2025-09-21 07:57:53 +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
李玉东
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
d0789c5a7c 设置全局scenario值 2025-09-21 02:24:52 +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
wangwenhua
d770ac1a39 设置全局scenario值 2025-09-20 22:22:25 +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
李玉东
b83d98c178 任务相关 2025-09-20 18:21:04 +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