Commit Graph

433 Commits

Author SHA1 Message Date
wangweidong 526cb02d50 同步 2026-01-06 16:37:04 +08:00
Teng bc254bcedd 改样式 2026-01-06 15:40:41 +08:00
Teng f0ee30fa03 合并 2026-01-06 15:18:23 +08:00
Teng 7c71ed8b07 合并冲突 2026-01-06 15:03:01 +08:00
wangweidong 3afb825ac5 同步 2026-01-06 14:15:35 +08:00
Teng 3b8d03e494 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2026-01-06 13:26:41 +08:00
Teng 03039bba8a 改样式 2026-01-06 13:25:45 +08:00
wangweidong f8aebe2134 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2026-01-06 13:23:31 +08:00
wangweidong d7d79c7435 同步 2026-01-06 13:23:24 +08:00
Teng fcf77a76da Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2026-01-06 11:06:19 +08:00
Teng 97caef2eea 改样式 2026-01-06 11:06:16 +08:00
wangweidong 3c46e894bc Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2026-01-06 08:56:19 +08:00
wangweidong 648d7598f3 同步 2026-01-06 08:53:57 +08:00
Teng fec62e4525 日程表预览 2026-01-06 08:51:58 +08:00
Teng 5ce6b38f90 合并代码 2026-01-06 08:32:56 +08:00
Teng 5df021258c Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2026-01-05 16:06:46 +08:00
Teng 6c94b6f07b 合并 2026-01-05 16:06:43 +08:00
wangweidong 9220663836 同步 2026-01-05 15:33:29 +08:00
wangweidong b8bbbe1a0f 同步 2026-01-05 15:32:51 +08:00
Teng 195bfd4784 调整参数 2026-01-05 15:10:39 +08:00
Teng 8613385d48 首页动画完事了 2026-01-05 14:45:52 +08:00
Teng 18c8267a94 完事 2026-01-05 14:28:16 +08:00
Teng 6dc29c697d Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2026-01-05 14:14:40 +08:00
Teng 8461da4803 合并 2026-01-05 14:14:36 +08:00
wangweidong 4234844fc1 推送 2026-01-05 11:01:11 +08:00
wangweidong 5cf16b3a62 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2026-01-05 09:31:18 +08:00
wangweidong d8d770e29f 解决冲突 2026-01-05 09:31:13 +08:00
wangweidong 997166581c 提交 2026-01-05 09:29:43 +08:00
Teng b589fe6382 合并代码 2026-01-05 09:29:35 +08:00
Teng d9d14b2187 新主页 2026-01-04 17:09:11 +08:00
wangweidong 2024245b4d 同步 2025-12-31 16:06:28 +08:00
wangweidong b587ae0f89 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-31 15:36:23 +08:00
wangweidong 1a82993c0c 同步 2025-12-31 15:36:13 +08:00
Teng 1306e3bdd6 合并代码 2025-12-31 10:12:36 +08:00
Teng 1b846f41a2 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-30 16:38:39 +08:00
Teng 83e3cd8102 中控 2025-12-30 16:38:37 +08:00
wangweidong ce4bb0b25a Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-30 16:38:09 +08:00
wangweidong f1868c40b3 同步 2025-12-30 16:38:01 +08:00
Teng a53318fdb2 中控室 2025-12-30 14:30:48 +08:00
Teng cc6b443275 合并 2025-12-30 11:23:55 +08:00
wangweidong 31d2d99ad3 修复冲突 2025-12-30 08:43:57 +08:00
wangweidong 73b45134e6 同步 2025-12-30 08:42:53 +08:00
Teng c29230a3c4 合并 2025-12-30 08:40:09 +08:00
Teng d6b0574b5d Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-26 17:31:10 +08:00
Teng 4279049add 合并 2025-12-26 17:31:07 +08:00
wangweidong eb43b90dc3 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-26 17:14:29 +08:00
wangweidong b1f5b3ce49 tb 2025-12-26 17:14:23 +08:00
Teng 0ad5232f24 合并代码 2025-12-26 16:07:43 +08:00
wangweidong 51bbc2ac2b Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-26 15:36:02 +08:00
wangweidong f24e658186 tb 2025-12-26 15:35:54 +08:00
Teng abad905b05 仓库首页 2025-12-26 15:35:05 +08:00
Teng 609f159318 仓库首页 2025-12-26 15:34:50 +08:00
Teng 30704cb62a 库房单元首页完事 2025-12-26 15:15:35 +08:00
wangweidong 502263bbd3 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-26 10:07:47 +08:00
wangweidong c0a462f4ef tj 2025-12-26 10:07:35 +08:00
Teng 9556186dff 护理单元首页完事 2025-12-26 10:03:50 +08:00
Teng 5a7134a3c5 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-25 17:30:37 +08:00
Teng 3dc64c826e 合并 2025-12-25 17:30:31 +08:00
wangweidong dabfc579af Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-25 14:40:26 +08:00
wangweidong 4e2626f2d9 同步 2025-12-25 14:40:18 +08:00
Teng 73c0a60c2a 合并代码 2025-12-25 14:37:43 +08:00
Teng 9d7668dad8 新护理单元 2025-12-25 13:40:02 +08:00
wangweidong 512c1875f9 提交 2025-12-25 13:27:31 +08:00
Teng 5f3d46a899 新主页设置完成 2025-12-25 09:50:35 +08:00
Teng 3313913011 换了新主页 2025-12-25 09:25:47 +08:00
wangweidong 089e3a6acb 提交 2025-12-25 08:43:37 +08:00
wangweidong dd3dd9837d 提交 2025-12-23 13:56:10 +08:00
wangweidong 190934e997 同步 2025-12-23 13:26:02 +08:00
wangweidong 8d5b570f97 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-22 16:55:54 +08:00
wangweidong e18c15bc0f 同步 2025-12-22 16:55:46 +08:00
Teng ac3ef67c98 合并 2025-12-22 16:23:52 +08:00
wangweidong 53f694b33c 同步 2025-12-22 15:27:44 +08:00
wangweidong fa55257cdc 同步 2025-12-22 13:19:05 +08:00
Teng 31f5240104 提交 2025-12-22 10:32:48 +08:00
wangweidong 2085d90da2 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-22 08:51:14 +08:00
wangweidong 1cb9b99b2b 同步 2025-12-22 08:51:06 +08:00
Teng 83753aed1d Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-22 08:48:31 +08:00
Teng 774d15dca7 提交字段修改 2025-12-22 08:47:55 +08:00
wangweidong de81495e20 同步 2025-12-19 16:08:58 +08:00
wangweidong ec474003d1 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-18 17:18:04 +08:00
wangweidong 4a1560759e 同步 2025-12-18 17:17:55 +08:00
Teng cbbf98f6e6 合并 2025-12-18 16:56:41 +08:00
Teng 31589526f5 新主页整完了 2025-12-18 16:02:11 +08:00
Teng 583c702d11 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-18 10:23:57 +08:00
Teng 744bba860d 新首页整完了 2025-12-18 10:23:55 +08:00
wangweidong d30f92f970 同步 2025-12-17 17:16:35 +08:00
wangweidong 20258118c7 同步 2025-12-17 15:48:36 +08:00
wangweidong 4b1e6f97ea Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-16 16:54:42 +08:00
wangweidong adcb1cab94 提交 2025-12-16 16:54:29 +08:00
Teng 1cfc1c5d8b 合并 2025-12-16 13:20:55 +08:00
Teng aa4a313d2a Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-16 13:14:41 +08:00
Teng e60a9d6eaa 合并 2025-12-16 13:14:38 +08:00
wangweidong 4f0b875a20 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-16 11:26:08 +08:00
wangweidong 33dc29e6f3 拉去 2025-12-16 11:26:01 +08:00
Teng 2428c26dd8 合并 2025-12-16 11:05:37 +08:00
Teng da753516af Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-16 10:29:58 +08:00
Teng 6b1c27e71b 合并 2025-12-16 10:29:54 +08:00
wangweidong 433fb13230 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-16 09:12:51 +08:00
wangweidong a359724f02 同步 2025-12-16 09:12:42 +08:00
Teng 6eec7e636f 合并 2025-12-16 09:00:48 +08:00
wangweidong 23eb856142 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-16 08:48:29 +08:00
wangweidong aa4fe4dacd 同步 2025-12-16 08:48:22 +08:00
Teng ba048f1d39 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-16 08:47:19 +08:00
Teng e4335de6b5 合并 2025-12-16 08:47:17 +08:00
wangweidong b7e72edff5 同步 2025-12-15 17:27:34 +08:00
wangweidong eedd182ad7 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-15 17:13:52 +08:00
wangweidong d39a6367bc '合并' 2025-12-15 17:13:43 +08:00
Teng d65845f462 合并 2025-12-15 17:09:12 +08:00
Teng 4495f732c7 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-15 13:36:25 +08:00
Teng 798515f544 先提一版 2025-12-15 13:36:09 +08:00
wangweidong 2747b32521 合并 2025-12-12 17:32:23 +08:00
wangweidong bd906abad1 同步 2025-12-12 17:30:33 +08:00
Teng e625c3ea86 合并 2025-12-12 17:24:02 +08:00
Teng a84fe916ca 合并 2025-12-12 17:04:12 +08:00
Teng 3d1ec09229 合并 2025-12-12 17:02:33 +08:00
wangweidong ae95d91434 同步s 2025-12-12 14:53:37 +08:00
wangweidong 614f9c6133 同步 2025-12-12 14:42:26 +08:00
wangweidong fdb03e4028 同步 2025-12-12 14:41:44 +08:00
Teng f921484671 合并 2025-12-12 14:13:40 +08:00
Teng 55cfb1fa54 拉去 2025-12-11 17:30:09 +08:00
Teng f979ef5297 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-11 10:09:41 +08:00
Teng 8039afb825 合并代码 2025-12-11 10:09:33 +08:00
wangweidong 819ba71570 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-11 08:39:22 +08:00
wangweidong c74b77267d 同步 2025-12-11 08:39:14 +08:00
Teng cd6b44efe6 合并代码 2025-12-11 08:28:51 +08:00
Teng 13ea567bb4 合并 2025-12-10 17:30:16 +08:00
Teng f0b11cbe1b 修bug,加模块 2025-12-10 16:29:41 +08:00
Teng f3b69d648f Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-09 17:02:37 +08:00
Teng 60fc092827 合并 2025-12-09 17:02:35 +08:00
wangweidong a2e634674c 同步 2025-12-09 16:06:38 +08:00
wangweidong 5f363f988f Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-09 15:22:02 +08:00
wangweidong 2529320d73 同步 2025-12-09 15:21:53 +08:00
Teng 0241ae166e 合并一下 2025-12-09 15:21:01 +08:00
Teng 6692c9be4f Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-09 15:09:36 +08:00
Teng a5a724ac8d 合并 2025-12-09 15:09:33 +08:00
wangweidong 733281a2ce Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-09 15:05:53 +08:00
wangweidong 43990ed658 同步 2025-12-09 15:05:45 +08:00
Teng 16e520f574 合并 2025-12-09 09:07:42 +08:00
Teng acc686e13d 合并 2025-12-09 09:05:38 +08:00
wangweidong 0f3b7368b2 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-09 09:04:07 +08:00
wangweidong af0f5b245b 合并 2025-12-09 09:03:56 +08:00
Teng 50d38440b2 Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-09 08:49:58 +08:00
Teng 67493e8525 合并代码 2025-12-09 08:49:50 +08:00
wangweidong 5ac9ce0783 同步 2025-12-09 08:32:27 +08:00
wangweidong cdfd4b74b7 同步 2025-12-08 17:30:45 +08:00
wangweidong 37f4b73fe3 更改 2025-12-08 17:00:33 +08:00
wangweidong 7c0a5b5551 同步 2025-12-08 16:59:28 +08:00
Teng 1527c7a5ee 合并 2025-12-08 16:51:24 +08:00
Teng 3ddf1ab54b Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-12-08 15:32:32 +08:00
Teng 4c53353584 合并 2025-12-08 15:32:29 +08:00