Commit Graph

1223 Commits

Author SHA1 Message Date
duanxiaohai 442ef4a995 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-09-02 15:19:36 +08:00
姚宇浩 88effb1c9d Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-09-02 15:19:15 +08:00
姚宇浩 14d8cc3ad8 gx 2024-09-02 15:18:50 +08:00
duanxiaohai e2729c6b21 gx 2024-09-02 15:12:30 +08:00
duanxiaohai b495b58afd gx 2024-09-02 14:52:26 +08:00
duanxiaohai 924391044b gx 2024-09-02 14:51:29 +08:00
duanxiaohai 89f5ba486f gx 2024-08-30 16:38:45 +08:00
姚宇浩 8e40adcdd3 gx 2024-08-30 11:42:50 +08:00
姚宇浩 d763a20212 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-30 11:35:47 +08:00
姚宇浩 6809d6f8c3 1 2024-08-30 11:30:04 +08:00
duanxiaohai 65e80ea739 gx 2024-08-30 11:29:31 +08:00
duanxiaohai 444dae5dfd Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-30 11:24:51 +08:00
duanxiaohai fb553082d9 gx 2024-08-30 11:24:49 +08:00
姚宇浩 c52e29b1a6 1111 2024-08-30 09:19:34 +08:00
姚宇浩 154afb480c gx 2024-08-29 17:26:49 +08:00
姚宇浩 31e1d24e7b Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-29 16:50:25 +08:00
姚宇浩 d09bf8ccf9 1 2024-08-29 16:50:20 +08:00
duanxiaohai ecdd880a08 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-29 16:39:52 +08:00
duanxiaohai 25d0a9c67c gx 2024-08-29 16:39:49 +08:00
姚宇浩 6ed4bbd1ea gx 2024-08-28 17:10:18 +08:00
姚宇浩 ab51a0208d 批量 2024-08-28 16:54:45 +08:00
姚宇浩 5a8bfbff49 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-28 15:41:59 +08:00
姚宇浩 59a92c5b94 11 2024-08-28 15:41:20 +08:00
duanxiaohai 7ddc313d8a gx 2024-08-28 15:36:58 +08:00
duanxiaohai 3ae1e1df34 gx 2024-08-28 11:07:25 +08:00
duanxiaohai 677745276b Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-28 10:58:26 +08:00
duanxiaohai c488581c39 gx 2024-08-28 10:58:21 +08:00
姚宇浩 6745c6797d Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-27 17:28:29 +08:00
姚宇浩 e9069ee683 gx 2024-08-27 17:28:19 +08:00
duanxiaohai b691ad3faf gx 2024-08-27 17:16:52 +08:00
duanxiaohai 035827670d gx 2024-08-27 16:29:23 +08:00
姚宇浩 21445ad8cb Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-27 14:58:39 +08:00
姚宇浩 60fa1316eb 1 2024-08-27 14:58:11 +08:00
duanxiaohai 43211693cc gx 2024-08-27 14:49:38 +08:00
duanxiaohai ea865d5ccd gx 2024-08-27 14:41:55 +08:00
duanxiaohai 9e90543007 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-27 14:41:11 +08:00
duanxiaohai 136b3ede52 gx 2024-08-27 14:41:08 +08:00
姚宇浩 7134f082a3 移动 2024-08-27 11:18:12 +08:00
姚宇浩 09dc8f40f5 111 2024-08-27 10:25:53 +08:00
duanxiaohai 18809f588d Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-26 17:01:17 +08:00
duanxiaohai fed5793834 gx 2024-08-26 17:01:14 +08:00
姚宇浩 4bcc4eaf5d 6 2024-08-26 16:51:57 +08:00
姚宇浩 2051d49d98 111 2024-08-26 14:24:55 +08:00
duanxiaohai 9c0e098d9b gx 2024-08-26 14:22:06 +08:00
姚宇浩 b3a112bce4 移动 2024-08-26 14:13:18 +08:00
duanxiaohai 9638804420 gx 2024-08-26 11:47:13 +08:00
duanxiaohai d71cad9ef2 gx 2024-08-26 09:09:15 +08:00
duanxiaohai 876e15a98d gx 2024-08-25 15:55:37 +08:00
duanxiaohai df116895a3 gx 2024-08-25 15:51:41 +08:00
littleeewolf a1cfbd1dc7 11111 2024-08-25 15:30:36 +08:00
littleeewolf fa7b380e64 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-25 15:23:33 +08:00
littleeewolf 13462c2b66 1111 2024-08-25 15:23:01 +08:00
duanxiaohai d40aa801c7 gx 2024-08-25 15:20:49 +08:00
duanxiaohai bf5b692662 gx 2024-08-25 15:20:29 +08:00
littleeewolf dd2928357a 11 2024-08-24 20:42:54 +08:00
littleeewolf db8719e94a 111 2024-08-24 20:31:56 +08:00
littleeewolf ad093282d1 gx 2024-08-24 20:22:32 +08:00
duanxiaohai 909c2a1e99 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-24 20:14:33 +08:00
duanxiaohai 64a3f730ad gx 2024-08-24 20:14:31 +08:00
littleeewolf bad6862f0d 1 2024-08-24 20:14:07 +08:00
duanxiaohai 00f0c6e3fe gx 2024-08-24 19:44:06 +08:00
littleeewolf 9d5bf80c15 111 2024-08-24 19:41:58 +08:00
duanxiaohai 7dd5645e1d gx 2024-08-23 18:06:46 +08:00
duanxiaohai f9aba751a8 gx 2024-08-23 18:03:59 +08:00
duanxiaohai aa6f9dc456 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-23 17:22:54 +08:00
duanxiaohai 10b59a4843 gx 2024-08-23 17:22:52 +08:00
姚宇浩 7705d6bdbf gx 2024-08-23 17:22:30 +08:00
duanxiaohai 23bc607c07 gx 2024-08-23 17:14:57 +08:00
duanxiaohai ea6d0c10b7 gx 2024-08-23 17:02:54 +08:00
duanxiaohai 6d6584263c gx 2024-08-23 17:02:32 +08:00
姚宇浩 6b3aa3d709 摄像头 2024-08-23 17:00:27 +08:00
姚宇浩 2f71fcf2f5 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-23 15:26:12 +08:00
姚宇浩 1f7ce08341 gx 2024-08-23 15:26:07 +08:00
duanxiaohai 5b7d239bdd gx 2024-08-23 14:52:01 +08:00
duanxiaohai 68bd7cf02d gx 2024-08-23 14:29:59 +08:00
duanxiaohai 2052962d01 gx 2024-08-23 14:29:04 +08:00
姚宇浩 ca1ab4ff03 111 2024-08-23 11:15:53 +08:00
姚宇浩 c1124d4016 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-23 11:00:21 +08:00
姚宇浩 d8066a9535 11 2024-08-23 11:00:15 +08:00
duanxiaohai 80a7feafb0 gx 2024-08-23 10:58:35 +08:00
duanxiaohai 60b27946ca gx 2024-08-23 10:39:02 +08:00
duanxiaohai 81aa336233 gx 2024-08-23 10:36:59 +08:00
姚宇浩 baca4c4349 111 2024-08-23 10:36:24 +08:00
duanxiaohai 6056d54d8a Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-23 10:10:06 +08:00
duanxiaohai 52d99a8492 gx 2024-08-23 10:10:04 +08:00
姚宇浩 cb14963e11 特殊标签 2024-08-23 09:31:22 +08:00
姚宇浩 2568a0e6c8 gx 2024-08-22 15:40:05 +08:00
姚宇浩 8468826d4d gx 2024-08-22 15:18:59 +08:00
姚宇浩 6336dbfafd 编辑区域加延迟 2024-08-22 14:52:20 +08:00
姚宇浩 80f796c7e1 聚集数据 2024-08-22 14:24:57 +08:00
姚宇浩 820c30a177 gx 2024-08-22 10:12:29 +08:00
姚宇浩 d6c5de75ab Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-21 17:15:22 +08:00
姚宇浩 600347f5d9 11 2024-08-21 17:13:39 +08:00
duanxiaohai 52d0a888bd gx 2024-08-21 14:39:44 +08:00
duanxiaohai 168069e2cf Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-21 13:38:30 +08:00
duanxiaohai 42b03c56ad gx 2024-08-21 13:38:27 +08:00
姚宇浩 9f59900219 gx 2024-08-21 13:36:49 +08:00
duanxiaohai 1b7be1a5f9 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-21 10:38:15 +08:00
duanxiaohai c8d49b1e1a gx 2024-08-21 10:38:13 +08:00
姚宇浩 61aa74ef6c 1111 2024-08-21 10:37:49 +08:00
duanxiaohai cc111a3994 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-21 08:59:36 +08:00
duanxiaohai 926b72f28a gx 2024-08-21 08:58:17 +08:00
姚宇浩 853947650f 111 2024-08-20 17:12:57 +08:00
姚宇浩 00de441697 动画 2024-08-20 16:48:38 +08:00
姚宇浩 e34071d948 gx 2024-08-20 15:54:19 +08:00
姚宇浩 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