| 
							
							
								 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 |  | 
			
				
					|  | b24681426f | 修改配置文件 | 2025-09-28 09:43:49 +08:00 |  | 
			
				
					|  | 577f639d60 | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-28 09:31:42 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | 2e9a0761d3 | 天气 | 2025-09-25 16:56:41 +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 |  | 
			
				
					|  | c99f2d6155 | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-22 18:22:00 +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 |  | 
			
				
					| 
							
							
								 李玉东 | 053c1a9984 | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-22 15:03:00 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | 6334c44e35 | 修改bug | 2025-09-22 15:01:09 +08:00 |  | 
			
				
					| 
							
							
								 李玉东 | 447020fe6c | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-22 14:49:47 +08:00 |  | 
			
				
					| 
							
							
								 李玉东 | af978f6237 | 任务相关 | 2025-09-22 14:49:28 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | baa1a1f1c6 | 修改bug | 2025-09-22 14:46:46 +08:00 |  | 
			
				
					| 
							
							
								 李玉东 | 0885d4e860 | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-22 14:26:45 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | ffdbe33632 | 修改bug | 2025-09-22 14:23:58 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | ee75390dd6 | 修改bug | 2025-09-22 14:17:49 +08:00 |  | 
			
				
					| 
							
							
								 李玉东 | 772bc62f9a | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend # Conflicts:
#	src/main/java/com/hivekion/ws/WsServer.java | 2025-09-22 14:07:54 +08:00 |  | 
			
				
					| 
							
							
								 李玉东 | 2237ffad9b | 任务相关 | 2025-09-22 14:07:22 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | cd76249853 | 修改bug | 2025-09-22 10:30:05 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | 5105dd13e7 | 修改包名 | 2025-09-22 09:56:41 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | 28e4417ce5 | 修改包名 | 2025-09-22 09:55:29 +08:00 |  | 
			
				
					|  | 5d3a0470d4 | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-21 12:51:36 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | e54f7fdfde | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-21 12:51:16 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | 982a8cd2f7 | 天气 | 2025-09-21 12:51:11 +08:00 |  | 
			
				
					|  | 6138b88aec | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-21 12:50:16 +08:00 |  | 
			
				
					| 
							
							
								 李玉东 | 45a832f777 | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-21 12:32:48 +08:00 |  | 
			
				
					| 
							
							
								 李玉东 | 10cf9622bb | 任务相关 | 2025-09-21 12:32:21 +08:00 |  | 
			
				
					| 
							
							
								 wangwenhua | e02e19c2d1 | 天气 | 2025-09-21 11:57:12 +08:00 |  | 
			
				
					|  | dc1f9cd3b7 | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-21 11:55:25 +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 |  | 
			
				
					|  | 61c5d6ba56 | Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend | 2025-09-21 09:34:03 +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 |  | 
			
				
					| 
							
							
								 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 |  |