Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
cf704f72fe
316 changed files with 86713 additions and 44137 deletions
|
|
@ -43,6 +43,10 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If FromOreoDiscount11Pro = 1 Then
|
||||
Var Seeker.BuyOreo11ProFlag = 1
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
Var LastMakeDrinkResult = "-"
|
||||
WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "--"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue