Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 67778a0d91 5.31推送 master L14\huangyilong 2024-05-31 17:46:36 +0800
• 53f85e483d 5-24推送 L14\huangyilong 2024-05-24 17:48:54 +0800
• 8248c9ba3f 5.11推送 L14\huangyilong 2024-05-11 17:54:29 +0800
• 4c5efe4125 4.30推送 L14\huangyilong 2024-04-30 18:44:37 +0800
• ac85563603 04.26推送代码 c'g'l 2024-04-26 17:32:45 +0800
• a5bed953a1 2024.04.23提交代码 c'g'l 2024-04-23 10:40:47 +0800
• dd73d2af34 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into rwkdev rongweikang 2024-03-29 17:57:37 +0800
• e01aad14ac 修复视频问题 rongweikang 2024-03-29 17:57:18 +0800
• 91becf3a69 临时 blak-kong 2024-03-29 17:56:58 +0800
• 404e01cc1a 打卡统计样式修复 blak-kong 2024-03-29 17:06:20 +0800
• 75bfd27ae7 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev blak-kong 2024-03-29 16:59:44 +0800
• f14cb28a59 修复bug blak-kong 2024-03-29 16:59:24 +0800
• 978142d08f 修改电流 qsj 2024-03-29 16:35:44 +0800
• 66b4abc067 修改脸部护理bug qsj 2024-03-29 16:17:24 +0800
• 661bbe18a3 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj qsj 2024-03-29 16:12:40 +0800
• 47757702b0 电流定制 qsj 2024-03-29 16:11:14 +0800
• 0fc7d07689 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev blak-kong 2024-03-29 13:59:38 +0800
• ab3ec7c8c1 临时 blak-kong 2024-03-29 13:59:17 +0800
• a6c7fb6eed Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into rwkdev rongweikang 2024-03-29 13:53:41 +0800
• 3589191eef 添加声音控制并修改ui问题 rongweikang 2024-03-29 13:51:01 +0800
• 79e7432953 完成echarts表格对接 rongweikang 2024-03-29 13:50:43 +0800
• f06b1d8cc1 修改样式 qsj 2024-03-29 10:56:54 +0800
• 63a28dba21 we100 前期准备 blak-kong 2024-03-28 20:49:05 +0800
• 9af2818990 优化 rongweikang 2024-03-28 09:33:00 +0800
• 126d80ba17 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into rwkdev rongweikang 2024-03-28 09:30:03 +0800
• 3f7e7fa9d8 添加弹窗 rongweikang 2024-03-28 09:28:38 +0800
• 51051e6bfb fix:横屏 blak-kong 2024-03-27 21:16:40 +0800
• a4d2d7a438 . blak-kong 2024-03-27 20:56:25 +0800
• 62901485e0 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev qsj 2024-03-27 19:45:41 +0800
• 21e61acb7d 临时 qsj 2024-03-27 18:54:05 +0800
• b61a5c4507 模式列表复制问题 blak-kong 2024-03-27 18:48:23 +0800
• 44c672c97f . blak-kong 2024-03-27 18:24:16 +0800
• f978e260b6 升级固件 blak-kong 2024-03-27 18:23:20 +0800
• 3a3d164762 修复弹窗被删除的问题 blak-kong 2024-03-27 16:28:21 +0800
• 1b4607ab01 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into rwkdev rongweikang 2024-03-27 15:08:52 +0800
• 48530fe7b0 添加配置文件 rongweikang 2024-03-27 15:07:40 +0800
• 8f043948c8 优化样式 rongweikang 2024-03-27 15:07:32 +0800
• 8bbeb2065d Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj qsj 2024-03-27 14:40:33 +0800
• 8d4cfcd59e 临时推送 qsj 2024-03-27 14:40:05 +0800
• 32d03bd9ee fix:样式冲突处理 blak-kong 2024-03-27 14:25:50 +0800
• c76c055467 测试横屏 blak-kong 2024-03-27 11:52:08 +0800
• e909ed328d Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev blak-kong 2024-03-27 10:22:57 +0800
• a7e7f63b4d Merge branch 'lzwdev' into dev blak-kong 2024-03-27 10:22:44 +0800
• f6bc35f884 we200 blak-kong 2024-03-27 10:22:32 +0800
• 89a76582b9 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev rongweikang 2024-03-27 09:10:56 +0800
• aed682c3c0 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev rongweikang 2024-03-27 09:10:09 +0800
• 86a194c666 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev blak-kong 2024-03-27 09:04:07 +0800
• c6f9dea300 临时 blak-kong 2024-03-27 09:03:40 +0800
• 22b0302113 删除意外多出来的代码 blak-kong 2024-03-26 18:17:04 +0800
• 71d57fc628 . blak-kong 2024-03-26 18:02:02 +0800
• c5cf3021f8 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj qsj 2024-03-26 15:23:08 +0800
• 73e792cabb 修改bug qsj 2024-03-26 15:23:01 +0800
• 5e402b2013 merge 合并代码 blak-kong 2024-03-26 15:19:15 +0800
• fe8fc9fd82 . blak-kong 2024-03-26 15:12:14 +0800
• ffb4910983 merge 合并代码 blak-kong 2024-03-26 13:49:42 +0800
• 3bc7def62f Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev rongweikang 2024-03-26 12:11:44 +0800
• 74b1901625 echarts图表 rongweikang 2024-03-26 11:58:35 +0800
• 30b227b892 fix:修复横向滚动条切换item，页面数据刷新导致横向滚动闪动回初始位置问题 blak-kong 2024-03-26 11:06:21 +0800
• fb65a464f3 修改bug qsj 2024-03-25 18:29:26 +0800
• 8922944ccc 修改bug qsj 2024-03-25 18:26:35 +0800
• 7e5b76ff5e Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj qsj 2024-03-25 16:09:35 +0800
• e148e5c48c 临时提交 qsj 2024-03-25 16:07:55 +0800
• 722482e8dd 临时 blak-kong 2024-03-25 16:00:10 +0800
• cbbaf16a6b merge:合并 blak-kong 2024-03-25 15:08:42 +0800
• 5320e0fc35 打卡记录优化 blak-kong 2024-03-25 15:07:36 +0800
• 93fdea9c9b 删除多余代码 rongweikang 2024-03-25 14:04:49 +0800
• e0ab75bf02 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj qsj 2024-03-25 11:46:32 +0800
• 041822f2dd 代码优化，样式修改 qsj 2024-03-25 11:45:11 +0800
• 66a87f249d merge：处理冲突 blak-kong 2024-03-25 11:30:51 +0800
• 23ffb520fb 处理冲突 blak-kong 2024-03-25 11:26:27 +0800
• 7d399d95d1 fix:设备管理和详情页还原UI设计稿 blak-kong 2024-03-25 11:22:33 +0800
• 4c77ad357c 水分测试护理报告 qsj 2024-03-22 20:08:38 +0800
• 7c357bb574 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj qsj 2024-03-22 19:29:11 +0800
• e8468ce3bd 护理报告 qsj 2024-03-22 19:26:24 +0800
• 7e6046d9eb 添加跳转数据 rongweikang 2024-03-22 18:55:55 +0800
• 0bdf48e9a3 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into rwkdev rongweikang 2024-03-22 18:47:12 +0800
• a3a27ec2c6 对接水分测试报告echarts rongweikang 2024-03-22 18:42:23 +0800
• 924638c3c9 临时提交 qsj 2024-03-22 17:59:42 +0800
• d467abfc6d Merge branch 'dev' into lzwdev blak-kong 2024-03-22 17:58:42 +0800
• d7379c37e8 查看序列号位置bug修复 blak-kong 2024-03-22 17:58:10 +0800
• 382a194c42 护理报告提交 qsj 2024-03-22 17:58:02 +0800
• 4e57ef0328 查看序列号位置 blak-kong 2024-03-22 17:38:07 +0800
• 2945b222f3 水分切换视频 qsj 2024-03-22 17:00:00 +0800
• 1e38a4fe04 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj qsj 2024-03-22 16:43:33 +0800
• 5d365bb029 临时提交 qsj 2024-03-22 16:39:34 +0800
• 88bc691525 合并冲突 blak-kong 2024-03-22 16:38:28 +0800
• d6729d0de3 FR200 促渗模式自动震动蜂鸣切换档位 blak-kong 2024-03-22 16:33:30 +0800
• 5b31d64e38 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj qsj 2024-03-22 14:40:23 +0800
• fbe919b21e 临时提交 qsj 2024-03-22 14:39:14 +0800
• 65b5e36c5c Merge branch 'rwkdev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev rongweikang 2024-03-22 14:36:54 +0800
• 2d213c6a05 优化 rongweikang 2024-03-22 14:28:31 +0800
• 642b8fd410 修改分包 rongweikang 2024-03-22 14:18:42 +0800
• b2f8a48528 解决冲突 qsj 2024-03-22 10:42:31 +0800
• af205347e6 回看报告 qsj 2024-03-22 10:39:37 +0800
• 992f407cb1 添加样式 rongweikang 2024-03-22 09:34:06 +0800
• e6627a19ba Merge branch 'rwkdev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev rongweikang 2024-03-22 09:33:43 +0800
• 57c2834de2 优化 rongweikang 2024-03-22 09:24:16 +0800
• cf920fd2c8 Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj qsj 2024-03-21 15:00:07 +0800
• 4362697884 修改bug qsj 2024-03-21 14:59:46 +0800
• 586edb21de 合并冲突 blak-kong 2024-03-21 14:59:34 +0800