pry
|
8365f13b79
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
taoye
|
e74a7c674c
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
taoye
|
70f1536d3c
|
临时提交
|
pirms 2 gadiem |
pry
|
78c2735d6c
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
pry
|
0067f25c96
|
报表数据保存
|
pirms 2 gadiem |
NXX
|
dceac72420
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
NXX
|
0f50f5c341
|
Dosing权限管理
|
pirms 2 gadiem |
pengliangyang
|
d0c37edfde
|
解决冲突
|
pirms 2 gadiem |
pengliangyang
|
e17642d323
|
添加吉香居大小料站代码
|
pirms 2 gadiem |
taoye
|
509038909e
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
taoye
|
037bba59c3
|
180更新
|
pirms 2 gadiem |
pry
|
e1e0af0d72
|
s7 协议开发
|
pirms 2 gadiem |
pry
|
d93a5b08a5
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
pry
|
3b09876d77
|
合并修改
|
pirms 2 gadiem |
taoye
|
1cb5d3fa5b
|
临时更新
|
pirms 2 gadiem |
taoye
|
d05d3b9ddf
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
taoye
|
07a357d1bc
|
180更新
|
pirms 2 gadiem |
pry
|
a219131cfe
|
冲突解决
|
pirms 2 gadiem |
NXX
|
988b3c9d85
|
Do
|
pirms 2 gadiem |
NXX
|
debd82dd19
|
Do
|
pirms 2 gadiem |
NXX
|
a2666d8502
|
do
|
pirms 2 gadiem |
NXX
|
2a6c505ccf
|
do
|
pirms 2 gadiem |
taoye
|
a04e3d455c
|
180更新
|
pirms 2 gadiem |
pry
|
93ab3ffbff
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
pry
|
97bce7aaf0
|
配料控制修改
|
pirms 2 gadiem |
taoye
|
9dd80b6e06
|
180更新
|
pirms 2 gadiem |
taoye
|
f115eea043
|
冲突解决
|
pirms 2 gadiem |
taoye
|
658f5be0bb
|
临时提交
|
pirms 2 gadiem |
pengliangyang
|
5a47150a28
|
解决冲突
|
pirms 2 gadiem |
pengliangyang
|
035fa7b6f0
|
柔性味魔方测试完成
|
pirms 2 gadiem |
taoye
|
add57b05fb
|
临时提交
|
pirms 2 gadiem |
NXX
|
364355ac99
|
MmorkT
|
pirms 2 gadiem |
taoye
|
3fbaba8616
|
临时提交
|
pirms 2 gadiem |
pry
|
3a6aab770f
|
冲突解决
|
pirms 2 gadiem |
pry
|
ade915e447
|
NFC修改
|
pirms 2 gadiem |
NXX
|
38209bb81e
|
morktM
|
pirms 2 gadiem |
NXX
|
c432766a12
|
MorkTM
|
pirms 2 gadiem |
taoye
|
2580ee58aa
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
taoye
|
86f8fda108
|
临时提交
|
pirms 2 gadiem |
pengliangyang
|
453c42ee29
|
SmartClient代码整理
|
pirms 2 gadiem |
taoye
|
022a052efb
|
冲突解决
|
pirms 2 gadiem |
taoye
|
6586f8e129
|
180更新
|
pirms 2 gadiem |
pry
|
83f566068d
|
调整修改
|
pirms 2 gadiem |
pry
|
ccd3f153e2
|
店铺保存按钮
|
pirms 2 gadiem |
pry
|
7ff52df490
|
Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient
|
pirms 2 gadiem |
pry
|
d4dc708fbc
|
硬件状态修改
|
pirms 2 gadiem |
pengliangyang
|
7f71e85781
|
解决冲突
|
pirms 2 gadiem |
pengliangyang
|
9b7871e682
|
删除morkT监视
|
pirms 2 gadiem |
NXX
|
a000f4cb97
|
MorkTM
|
pirms 2 gadiem |
NXX
|
cbb494de60
|
MORKTM
|
pirms 2 gadiem |