Commit Graph

1039 Commits

Author SHA1 Message Date
姚宇浩 901611527e Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-20 14:33:02 +08:00
姚宇浩 aa24dc255a gx 2024-08-20 14:32:52 +08:00
duanxiaohai 59c1c4df02 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-20 14:15:47 +08:00
姚宇浩 d73a294967 111 2024-08-20 14:14:40 +08:00
duanxiaohai d1d84ac4c2 gx 2024-08-20 14:14:36 +08:00
duanxiaohai 5af6dbec1a gx 2024-08-20 13:41:36 +08:00
姚宇浩 c86f041201 gx 2024-08-20 13:40:53 +08:00
姚宇浩 a583794cc5 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-19 17:03:20 +08:00
姚宇浩 79e93bba99 11 2024-08-19 17:03:12 +08:00
duanxiaohai 2bff350d95 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-19 16:54:40 +08:00
duanxiaohai 7b801125d4 gx 2024-08-19 16:54:39 +08:00
姚宇浩 c47aea47fe Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-19 16:54:17 +08:00
姚宇浩 f1ee85fcf6 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-19 16:53:38 +08:00
姚宇浩 778231a530 gx 2024-08-19 16:53:32 +08:00
duanxiaohai 868c6cecea gx 2024-08-19 16:53:12 +08:00
姚宇浩 6a7d268a79 年龄分布 2024-08-19 10:06:43 +08:00
duanxiaohai e1c792cba6 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-16 17:32:31 +08:00
duanxiaohai c91516817e gx 2024-08-16 17:32:28 +08:00
姚宇浩 856b8a6930 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-16 17:05:13 +08:00
姚宇浩 1f4cf37bd7 gx 2024-08-16 17:05:07 +08:00
duanxiaohai febecca990 gx 2024-08-16 17:03:12 +08:00
duanxiaohai f114cdac7c Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-16 16:44:06 +08:00
duanxiaohai c1dc751470 gx 2024-08-16 16:44:02 +08:00
姚宇浩 526238ade3 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-16 16:35:13 +08:00
姚宇浩 501044f29e gx 2024-08-16 16:35:09 +08:00
duanxiaohai 3cef103c8d Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-16 14:54:31 +08:00
duanxiaohai b8f05499cb gx 2024-08-16 14:54:26 +08:00
姚宇浩 80af4af2c3 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-16 14:07:47 +08:00
姚宇浩 85fab5b343 1 2024-08-16 14:07:39 +08:00
姚宇浩 2914bf3727 优化 2024-08-16 11:38:36 +08:00
duanxiaohai 248ef50016 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-16 10:46:05 +08:00
duanxiaohai 4ce03b82b5 gx 2024-08-16 10:44:36 +08:00
姚宇浩 9de5dc3c06 gx 2024-08-15 15:44:34 +08:00
duanxiaohai 0496652a10 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-15 15:19:21 +08:00
duanxiaohai 471beffb7a gx 2024-08-15 15:19:18 +08:00
姚宇浩 c75290276b 111 2024-08-15 15:15:02 +08:00
duanxiaohai 95a70af276 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-15 15:11:49 +08:00
姚宇浩 f5c653979a 样式 2024-08-15 15:11:30 +08:00
duanxiaohai d42c899e01 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-15 14:57:22 +08:00
duanxiaohai d1228e3d11 gx 2024-08-15 14:57:15 +08:00
姚宇浩 8a8e34841d gx 2024-08-15 14:56:27 +08:00
姚宇浩 56f40aea34 gx 2024-08-15 13:24:46 +08:00
姚宇浩 58b2500db2 gx 2024-08-15 10:48:54 +08:00
duanxiaohai e55e8039a8 gx 2024-08-14 16:38:47 +08:00
duanxiaohai 8e3e92823a Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-14 16:24:10 +08:00
duanxiaohai d1cc12fe6e gx 2024-08-14 16:24:04 +08:00
姚宇浩 51cc8868e7 gx 2024-08-14 15:46:27 +08:00
姚宇浩 33fcfdd592 gx 2024-08-14 15:29:29 +08:00
姚宇浩 c56c69f19f gx 2024-08-14 15:10:48 +08:00
姚宇浩 85436382bc gx 2024-08-14 15:10:02 +08:00
姚宇浩 65d1df5447 1 2024-08-14 14:58:50 +08:00
姚宇浩 94358fffa5 loading 2024-08-14 14:51:18 +08:00
姚宇浩 72526bec33 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-14 10:23:51 +08:00
姚宇浩 13ac4e9e27 gx 2024-08-14 10:23:47 +08:00
duanxiaohai 2585de002d Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-14 10:22:19 +08:00
duanxiaohai 39f7d693b6 gx 2024-08-14 10:22:14 +08:00
姚宇浩 45b8e12b13 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-14 09:24:04 +08:00
姚宇浩 fa5def7c0f gx 2024-08-14 09:24:00 +08:00
duanxiaohai d8770a92cb Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-14 09:05:13 +08:00
duanxiaohai 5ef2439b49 gx 2024-08-14 09:05:11 +08:00
姚宇浩 0c99f5c095 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-13 17:12:44 +08:00
姚宇浩 46a111f01f gx 2024-08-13 17:12:18 +08:00
duanxiaohai b1022ecec8 gx 2024-08-13 16:05:12 +08:00
duanxiaohai 89f41d8b5d Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-13 15:29:58 +08:00
duanxiaohai 25f1b6f6f8 gx 2024-08-13 15:29:54 +08:00
姚宇浩 10689020d1 gx 2024-08-13 15:29:28 +08:00
姚宇浩 1404413c5a gx 2024-08-13 10:09:27 +08:00
姚宇浩 8373cc7404 标签 2024-08-13 10:04:32 +08:00
duanxiaohai b57bd7e75d gx 2024-08-12 17:26:10 +08:00
duanxiaohai 73f7a2ed7e gx 2024-08-12 15:09:13 +08:00
duanxiaohai 6fff52f7f5 gx 2024-08-12 10:35:06 +08:00
duanxiaohai cd77c72bf4 gx 2024-08-12 09:26:34 +08:00
duanxiaohai d3a5bf2a60 gx 2024-08-12 09:08:40 +08:00
littleeewolf b1a5accbf1 微调 2024-08-11 18:37:05 +08:00
duanxiaohai 6ef2c5bf67 gx 2024-08-11 18:12:09 +08:00
duanxiaohai e9b574661e gx 2024-08-11 18:11:19 +08:00
duanxiaohai 790f92e1a8 gx 2024-08-11 17:52:21 +08:00
duanxiaohai e7fae8c4a6 gx 2024-08-11 17:41:34 +08:00
duanxiaohai 0e0940c60a gx 2024-08-11 17:13:00 +08:00
duanxiaohai 3b6db5869a gx 2024-08-11 16:15:53 +08:00
duanxiaohai 5c4a4619ef gx 2024-08-11 16:14:28 +08:00
duanxiaohai 37705f96f1 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-11 11:28:36 +08:00
duanxiaohai f5ff33e48d gx 2024-08-11 11:28:15 +08:00
littleeewolf 4d96a0c95d gx 2024-08-11 11:17:13 +08:00
littleeewolf 23a6f253d0 样式 2024-08-10 22:31:21 +08:00
littleeewolf 2c3360aef4 取消不请求接口 2024-08-10 20:01:11 +08:00
littleeewolf e5eb3f29a0 gx 2024-08-10 19:35:03 +08:00
littleeewolf ae1277651b gx 2024-08-10 16:07:58 +08:00
littleeewolf fa8fce9798 gx 2024-08-10 11:03:11 +08:00
姚宇浩 1dccba82ec 1 2024-08-09 16:36:42 +08:00
姚宇浩 b9c6d50149 gx 2024-08-09 16:03:08 +08:00
姚宇浩 98a7d30764 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-09 15:37:48 +08:00
姚宇浩 01ace14996 gx 2024-08-09 15:37:03 +08:00
duanxiaohai e3a1b48796 gx 2024-08-09 15:10:31 +08:00
姚宇浩 77a86f999d Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-09 14:29:47 +08:00
姚宇浩 030c46db26 gx 2024-08-09 14:28:29 +08:00
duanxiaohai 91c813e047 gx 2024-08-09 14:12:05 +08:00
duanxiaohai 875fce3f94 gx 2024-08-09 14:05:21 +08:00
姚宇浩 ed388d1573 gx 2024-08-09 13:35:29 +08:00
姚宇浩 aea590e4c0 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-09 11:23:22 +08:00
姚宇浩 3780594121 gx 2024-08-09 11:23:16 +08:00
duanxiaohai 73cb3d57c6 gx 2024-08-09 11:20:56 +08:00
duanxiaohai 8815e3da99 gx 2024-08-09 11:00:32 +08:00
姚宇浩 38152047ce gx 2024-08-08 17:23:13 +08:00
姚宇浩 e9c3003092 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-08 17:19:48 +08:00
姚宇浩 f59d03fc3b gx 2024-08-08 17:19:41 +08:00
duanxiaohai 9f54ea25cf gx 2024-08-08 17:13:50 +08:00
duanxiaohai a68e7afb22 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-08 14:23:53 +08:00
duanxiaohai 267cf8580b gx 2024-08-08 14:23:50 +08:00
姚宇浩 13f768e381 gx 2024-08-08 14:21:50 +08:00
姚宇浩 0285d753ab Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-08 10:31:49 +08:00
姚宇浩 dec210d2f6 gx 2024-08-08 10:30:13 +08:00
duanxiaohai e47fcd128d gx 2024-08-08 10:04:08 +08:00
duanxiaohai 863098aad3 gx 2024-08-08 10:03:41 +08:00
姚宇浩 971f1f0fd4 111 2024-08-07 16:15:57 +08:00
姚宇浩 5f94d9fb97 gx 2024-08-07 15:35:48 +08:00
姚宇浩 de8282a502 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-07 15:33:49 +08:00
姚宇浩 1dc5973393 gx 2024-08-07 15:33:46 +08:00
duanxiaohai 0f2f7fe8b6 gx 2024-08-07 15:32:19 +08:00
duanxiaohai 77db1c9331 gx 2024-08-07 15:13:06 +08:00
duanxiaohai 2a41980329 gx 2024-08-07 15:12:34 +08:00
姚宇浩 9f1b41760a Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-07 14:37:10 +08:00
姚宇浩 6b3a5dbab4 gx 2024-08-07 14:36:33 +08:00
duanxiaohai 87323e6cc4 gx 2024-08-07 11:19:31 +08:00
姚宇浩 0a0a8fa87d Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-07 09:28:51 +08:00
姚宇浩 4be1b4653b gx 2024-08-07 09:28:40 +08:00
duanxiaohai efc258e997 gx 2024-08-06 17:33:06 +08:00
duanxiaohai 392fb8ae05 gx 2024-08-06 15:48:51 +08:00
duanxiaohai fba0640d6e Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-06 15:46:25 +08:00
duanxiaohai 5b17fd793f gx 2024-08-06 15:46:18 +08:00
姚宇浩 52c7f14559 gx 2024-08-06 15:45:34 +08:00
姚宇浩 2c42020acf gxfor添加 2024-08-06 15:17:03 +08:00
姚宇浩 06c8c955b1 修改人口为0时的错位 2024-08-06 14:35:37 +08:00
duanxiaohai 8ef61ca63d gx 2024-08-06 14:00:43 +08:00
duanxiaohai 066c92ad48 gx 2024-08-06 13:59:49 +08:00
姚宇浩 ff96edad3b gx 2024-08-06 13:45:02 +08:00
姚宇浩 1d5fd217c9 gx 2024-08-06 13:43:01 +08:00
duanxiaohai 43157fccbc gx 2024-08-06 13:42:06 +08:00
duanxiaohai 1011b01aa7 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-06 11:25:30 +08:00
duanxiaohai d75da95745 gx 2024-08-06 11:25:19 +08:00
姚宇浩 2a2ff8b388 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-06 11:23:22 +08:00
姚宇浩 6d3d21312c Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-06 11:23:18 +08:00
姚宇浩 1151df11d5 gx 2024-08-06 11:22:49 +08:00
duanxiaohai 1da972679a gx 2024-08-06 11:22:48 +08:00
duanxiaohai 28bfea34b2 gx 2024-08-06 11:16:30 +08:00
duanxiaohai de2f241957 gx 2024-08-06 10:08:24 +08:00
duanxiaohai 34da0d1f0b gx 2024-08-06 09:12:39 +08:00
姚宇浩 4ad9d7b311 gxgetDatas2 2024-08-05 16:54:56 +08:00
姚宇浩 1d54b1c526 gx 2024-08-05 16:24:46 +08:00
姚宇浩 43a1487bf0 gx 2024-08-05 14:12:32 +08:00