- 26 Jul, 2018 2 commits
-
-
http://gitlab.freemud.com/shangshang.dai/FmTakeaway
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
戴尚尚 committed -
戴尚尚 committed
-
- 02 Jul, 2018 2 commits
-
-
guanghui.cui committed
-
guanghui.cui committed
-
- 25 Jun, 2018 1 commit
-
-
戴尚尚 committed
-
- 20 Jun, 2018 1 commit
-
-
guanghui.cui committed
-
- 13 Jun, 2018 1 commit
-
-
戴尚尚 committed
-
- 31 May, 2018 1 commit
-
-
unknown committed
-
- 11 May, 2018 1 commit
-
-
unknown committed
-
- 23 Apr, 2018 1 commit
-
-
unknown committed
-
- 03 Jan, 2018 1 commit
-
-
shangshang.dai committed
-
- 28 Dec, 2017 1 commit
-
-
Upd 1:修改订单详情[合计->优惠合计]
shangshang.dai committed
-
- 30 Nov, 2017 1 commit
-
-
shangshang.dai committed
-
- 14 Nov, 2017 1 commit
-
-
Fix 1: 小票样式修改 Signed-off-by: shangshang.dai <shangshang.dai@freemud.cn>
shangshang.dai committed
-
- 30 Oct, 2017 1 commit
-
-
shangshang.dai committed
-
- 27 Oct, 2017 1 commit
-
-
shangshang.dai committed
-
- 12 Oct, 2017 1 commit
-
-
shangshang.dai committed
-
- 20 Sep, 2017 1 commit
-
-
shangshang.dai committed
-
- 01 Sep, 2017 1 commit
-
-
shangshang.dai committed
-
- 31 Jul, 2017 4 commits
-
-
https://git.oschina.net/seventeendai/takeaway
Conflicts: fmPrinter/fmPrinter.cpp
shangshang.dai committed -
yunpeng.song committed
-
yunpeng.song committed
-
shangshang.dai committed
-
- 26 Jul, 2017 1 commit
-
-
shangshang.dai committed
-
- 25 Jul, 2017 1 commit
-
-
shangshang.dai committed
-
- 11 Jul, 2017 1 commit
-
-
shangshang.dai committed
-
- 03 Jul, 2017 1 commit
-
-
shangshang.dai committed
-
- 28 Jun, 2017 2 commits
-
-
shangshang.dai committed
-
2: 修复合并商品SKU丢失的问题
shangshang.dai committed
-
- 27 Jun, 2017 1 commit
-
-
shangshang.dai committed
-
- 26 Jun, 2017 1 commit
-
-
shangshang.dai committed
-
- 22 Jun, 2017 1 commit
-
-
shangshang.dai committed
-
- 13 Jun, 2017 1 commit
-
-
remark 写 接口发送订单的时间 备注：原先写的平台服务费作废 ocrDate 写 订单创建时间 Fix 2:【费用单】 fileDate 写 订单创建时间 note 写 接口发送订单的时间
shangshang.dai committed
-
- 12 Jun, 2017 1 commit
-
-
ss.dai committed
-
- 08 Jun, 2017 2 commits
- 06 Jun, 2017 2 commits
- 05 Jun, 2017 2 commits
