Графік комітів

52063fb (HEAD -> master) 冲突解决 by 如意彭 2022-05-30 10:03:31 +0800
725259e 临时修改 by 如意彭 2022-05-30 09:52:42 +0800
3e8b11d 最新代码 by itachilee 2022-05-30 09:39:23 +0800
bda2f08 解决冲突 by itachilee 2022-05-27 16:52:41 +0800
518d051 添加饮品水 by itachilee 2022-05-27 09:55:15 +0800
10a56d9 MortT更新 by taoye 2022-05-27 09:44:28 +0800
af125ff morkt更新 by taoye 2022-05-24 18:10:31 +0800
4762a74 冲突解除 by taoye 2022-05-23 09:55:33 +0800
b5802ee 冲突解决 by taoye 2022-05-23 09:54:32 +0800
f3a2c09 修改传感器信号判断 by itachilee 2022-05-21 19:27:17 +0800
9e5fdd1 冒菜机更新 by taoye 2022-05-21 19:10:49 +0800
5193905 更新修改 by 如意彭 2022-05-19 11:58:32 +0800
ec90c0b 解决冲突 by itachilee 2022-05-19 11:10:03 +0800
5f57fc4 果汁机工控机程序 by itachilee 2022-05-19 11:09:11 +0800
9363359 更新配置 by 如意彭 2022-05-16 20:53:57 +0800
2812e78 配置修改 by 如意彭 2022-05-16 20:47:34 +0800
d370350 冲突解决 by 如意彭 2022-05-16 20:46:57 +0800
35d83bd 服务修改 by 如意彭 2022-05-16 20:46:33 +0800
95a8dbe 新机台果汁机代码 by itachilee 2022-05-16 20:32:02 +0800
57ce449 appconfig冲突 by itachilee 2022-05-13 18:17:32 +0800
7cec56b 果汁机+判断流程 by itachilee 2022-05-13 18:15:25 +0800
976f703 冲突解决 by taoye 2022-05-12 15:10:01 +0800
1aeec9f 冒菜更新 by taoye 2022-05-12 15:08:49 +0800
a215b6b Merge branch 'master' of http://111.9.47.105:10244/PRY/HBLConsole by 如意彭 2022-05-11 21:02:01 +0800
6aa77fc 订单状态修改 by 如意彭 2022-05-11 21:01:55 +0800
05688e5 Merge branch 'master' of http://111.9.47.105:10244/PRY/HBLConsole by itachilee 2022-05-11 15:19:07 +0800
aeee24b 流程优化 by itachilee 2022-05-11 15:18:50 +0800
246e197 冰淇淋机器出口传感器检测 by NXX 2022-05-10 10:33:23 +0800
d10c1f4 全部流程跑通 by itachilee 2022-05-07 17:26:25 +0800
5fb66ba Merge branch 'master' of http://111.9.47.105:10244/PRY/HBLConsole by itachilee 2022-05-07 16:59:20 +0800
003dee8 MORKT调试修改 by itachilee 2022-05-07 16:59:03 +0800
e80f62b 更新提交 by fyf 2022-05-07 15:21:49 +0800
e4b6ad9 Merge branch 'master' of http://111.9.47.105:10244/PRY/HBLConsole by itachilee 2022-05-07 15:18:45 +0800
0a44c5b 调试 by itachilee 2022-05-07 15:18:34 +0800
87f5062 冲突解决 by taoye 2022-05-07 14:44:57 +0800
8ba181d 冒菜机代客下单联调修改 by taoye 2022-05-07 14:40:31 +0800
e4f7da3 优化流程 by itachilee 2022-05-07 14:34:09 +0800
1f84b94 Merge branch 'master' of http://111.9.47.105:10244/PRY/HBLConsole by 如意彭 2022-05-06 15:22:06 +0800
166c164 配置修改 by 如意彭 2022-05-06 15:22:02 +0800
cfbb3f1 解决冲突 by itachilee 2022-05-06 15:00:58 +0800
18eb794 单流程优化 by itachilee 2022-05-06 14:57:13 +0800
2e12773 配置修改 by 如意彭 2022-05-06 14:52:22 +0800
f868224 物料地址修改 by 如意彭 2022-05-06 11:35:45 +0800
8f1721e JakaAPI离线模式修改 by itachilee 2022-05-04 11:15:43 +0800
64b9871 Merge branch 'master' of http://111.9.47.105:10244/PRY/HBLConsole by itachilee 2022-05-04 10:34:05 +0800
6050d72 jakaAPI修改 by itachilee 2022-05-04 10:33:52 +0800
7662e71 Merge branch 'master' of http://111.9.47.105:10244/PRY/HBLConsole by taoye 2022-04-30 17:32:54 +0800
abc9ebd 冒菜机更新 by taoye 2022-04-30 17:32:24 +0800
02dd5a5 Merge branch 'master' of http://111.9.47.105:10244/PRY/HBLConsole by itachilee 2022-04-30 17:32:11 +0800
a4a14d9 添加MORKJC项目内容代码 by itachilee 2022-04-30 17:31:56 +0800
b4a4c35 冲突解决 by taoye 2022-04-30 13:27:10 +0800
39dffe0 冲突解决 by taoye 2022-04-30 13:24:19 +0800
8e16faa 冒菜机调试 by taoye 2022-04-30 13:21:21 +0800
5aab465 测试修改 by 如意彭 2022-04-30 13:18:53 +0800
eff6d92 更新 by itachilee 2022-04-30 13:08:53 +0800
5eae39f 冲突解决 by itachilee 2022-04-30 13:02:12 +0800
3e7d5e1 果汁机调试 by itachilee 2022-04-30 13:01:14 +0800
ff3f396 冒菜机调试 by 如意彭 2022-04-30 10:33:09 +0800
e9c6739 冒菜机调试 by 如意彭 2022-04-29 19:48:00 +0800
1d6a0dd 单片机协议 by 如意彭 2022-04-29 16:56:26 +0800
0de6b0c 添加MORKJC的调试界面 by itachilee 2022-04-29 10:38:17 +0800
eae1758 Merge branch 'master' of http://111.9.47.105:3000/PRY/HBLConsole by itachilee 2022-04-29 10:33:37 +0800
d94bc59 日日日 by itachilee 2022-04-29 10:24:29 +0800
0ba3900 添加morkjc debug调试界面 by itachilee 2022-04-29 10:23:02 +0800
4fb0b56 设备添加 by 如意彭 2022-04-29 10:21:47 +0800
bd752c5 果汁机项目添加 by itachilee 2022-04-29 10:12:16 +0800
88138cb tt by 如意彭 2022-04-29 10:02:15 +0800
5c36751 ccc by itachilee 2022-04-29 10:01:23 +0800
108b477 通讯库修改 by 如意彭 2022-04-29 00:03:43 +0800
e848cc3 果汁机协议 by 如意彭 2022-04-28 19:11:58 +0800
e139609 1 by taoye 2022-04-28 18:02:16 +0800
10743d7 1 by taoye 2022-04-28 18:01:19 +0800
e0c48b5 冒菜出餐更改 by taoye 2022-04-28 17:55:32 +0800
d4a1938 果汁机协议添加 by 如意彭 2022-04-28 17:55:28 +0800
d7a8b46 单片机通讯，更新订单模块 by 如意彭 2022-04-27 17:52:27 +0800
ae06475 更新包 by 如意彭 2022-04-27 13:09:32 +0800
67e9983 模拟订单修改 by 如意彭 2022-04-27 13:09:08 +0800
8dfcc5f 1 by fyf 2022-04-27 12:35:07 +0800
8b943ca 更新现场代码 by fyf 2022-04-27 12:31:54 +0800
0c23e5d 更新配置 by 如意彭 2022-04-27 11:19:07 +0800
f34fefb 上位机包管理修改 by 如意彭 2022-04-26 22:55:52 +0800
30d692e 冒菜机协议修改 by 如意彭 2022-04-26 12:51:25 +0800
af9d890 冒菜机修改 by 如意彭 2022-04-26 10:54:16 +0800
4193c7c 冒菜修改 by 如意彭 2022-04-26 10:17:58 +0800
28c6969 节卡机器人连接 by 如意彭 2022-04-25 09:41:48 +0800
15fa4c9 冒菜机 by 如意彭 2022-04-22 15:52:25 +0800
c1d16db 新设备增加 by 如意彭 2022-04-20 09:45:04 +0800
e036119 版本修改 by 如意彭 2022-04-18 16:20:40 +0800
8efc25e 通天塔 by 如意彭 2022-04-16 01:39:01 +0800
829bc20 冲突解决 by 如意彭 2022-04-16 01:37:50 +0800
6885c7a 冰淇淋机调试 by 如意彭 2022-04-16 01:35:57 +0800
de3827f 迁移 by itachilee 2022-04-15 15:47:59 +0800
336be41 控制修改 by itachilee 2022-04-15 15:45:14 +0800
ed9a181 冲突解决 by itachilee 2022-04-15 15:36:50 +0800
355c74a 退单 by 如意彭 2022-04-15 11:14:23 +0800
a695658 Merge branch 'master' of http://111.9.47.105:3000/PRY/HBLConsole by itachilee 2022-04-14 18:48:39 +0800
ccc3e86 修改杯子检测为机器人tcp数字输入 by itachilee 2022-04-14 18:48:30 +0800
f0bd295 小碗类型1，大碗类型2，还原 by taoye 2022-04-14 18:20:44 +0800
d2e1a9e 初始化MorkD变量，下碗位置增加13,14 两个值 by taoye 2022-04-14 17:49:02 +0800
35fe685 Merge branch 'master' of http://111.9.47.105:3000/PRY/HBLConsole by itachilee 2022-04-13 19:04:36 +0800

1 2 3 4