[33m7a38c978[m[33m ([m[1;36mHEAD -> [m[1;32mdev[m[33m, [m[1;31morigin/dev[m[33m, [m[1;32mskyorder[m[33m)[m HEAD@{0}: merge skyorder: Fast-forward
[33m9ca88b20[m HEAD@{1}: checkout: moving from skyorder to dev
[33m7a38c978[m[33m ([m[1;36mHEAD -> [m[1;32mdev[m[33m, [m[1;31morigin/dev[m[33m, [m[1;32mskyorder[m[33m)[m HEAD@{2}: commit: 添加滴滴 哆啦A夢框架，skyorder打印二維碼
[33m9ca88b20[m HEAD@{3}: checkout: moving from dev to skyorder
[33m9ca88b20[m HEAD@{4}: merge skyorder: Fast-forward
[33mfa4a065d[m HEAD@{5}: checkout: moving from skyorder to dev
[33m9ca88b20[m HEAD@{6}: commit: skyorder打印處理 新增哆啦A夢:滴滴開源工具（辅助开发工具、测试效率工具、视觉辅助工具）
[33m654437d8[m HEAD@{7}: commit: 修改餐廳操作相關類
[33mfa4a065d[m HEAD@{8}: checkout: moving from dev to skyorder
[33mfa4a065d[m HEAD@{9}: checkout: moving from skyorder to dev
[33mfa4a065d[m HEAD@{10}: checkout: moving from dev to skyorder
[33mfa4a065d[m HEAD@{11}: commit: 增加skyorder打印頁
[33ma1867471[m HEAD@{12}: commit: 添加skyokrder打印頁面UI
[33m6e91dc54[m HEAD@{13}: commit (merge): Merge branch 'youhua' into dev
[33m8366fd1e[m HEAD@{14}: merge master: Merge made by the 'recursive' strategy.
[33m4cce725c[m HEAD@{15}: checkout: moving from youhua to dev
[33mce4cd6d7[m[33m ([m[1;32myouhua[m[33m)[m HEAD@{16}: checkout: moving from dev to youhua
[33m4cce725c[m HEAD@{17}: merge origin/dev: Fast-forward
[33me75ec7a3[m HEAD@{18}: checkout: moving from master to dev
[33m547e42b5[m[33m ([m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m, [m[1;32mmaster[m[33m)[m HEAD@{19}: pull --progress --no-stat -v --progress origin master: Fast-forward
[33m5c281d9e[m HEAD@{20}: checkout: moving from youhua to master
[33mce4cd6d7[m[33m ([m[1;32myouhua[m[33m)[m HEAD@{21}: commit: 引入rxjava工具類
[33m0d0fc54b[m HEAD@{22}: commit: 1、按返回沒有彈出提示 尚有食物未送單,是否不保存返回 2、修改沒有找到會員提示 3、美化一下，按進細項，這數字建盤飛起來了
[33m525c4def[m HEAD@{23}: commit: 折扣增加：上限，獨佔，暫停，只一次，最小賬單金額邏輯
[33maa04da1b[m HEAD@{24}: commit: 增加折扣邏輯
[33m5dd12608[m HEAD@{25}: commit: 添加loadsir頁面反饋管理
[33ma40f7acb[m HEAD@{26}: commit: 修改數量調整
[33mf47767b0[m HEAD@{27}: commit: 賬單優化處理
[33m1a28da3b[m HEAD@{28}: commit: 餐檯下單優化
[33md6728069[m HEAD@{29}: commit: order-base模塊代碼遷移
[33m27732b86[m HEAD@{30}: commit: 拆分database模塊
[33me75ec7a3[m HEAD@{31}: checkout: moving from dev to youhua
[33me75ec7a3[m HEAD@{32}: checkout: moving from youhua_order to dev
[33m93346fc8[m HEAD@{33}: commit: 部分頁面報錯處理
[33mb1ed7e54[m HEAD@{34}: checkout: moving from dev to youhua_order
[33me75ec7a3[m HEAD@{35}: commit: 餐牌默認字體大小調整
[33maa267293[m HEAD@{36}: checkout: moving from youhua_order to dev
[33mb1ed7e54[m HEAD@{37}: checkout: moving from dev to youhua_order
[33maa267293[m HEAD@{38}: checkout: moving from discount to dev
[33maa267293[m HEAD@{39}: merge dev: Fast-forward
[33m81e309bb[m HEAD@{40}: checkout: moving from dev to discount
[33maa267293[m HEAD@{41}: commit: 餐廳擴展同步完善
[33m81e309bb[m HEAD@{42}: checkout: moving from discount to dev
[33m81e309bb[m HEAD@{43}: checkout: moving from dev to discount
[33m81e309bb[m HEAD@{44}: checkout: moving from youhua_order to dev
[33mb1ed7e54[m HEAD@{45}: checkout: moving from discount to youhua_order
[33m81e309bb[m HEAD@{46}: checkout: moving from dev to discount
[33m81e309bb[m HEAD@{47}: checkout: moving from youhua_order to dev
[33mb1ed7e54[m HEAD@{48}: checkout: moving from dev to youhua_order
[33m81e309bb[m HEAD@{49}: commit: 餐廳庫擴類拆分
[33md56efe83[m HEAD@{50}: checkout: moving from youhua_order to dev
[33mb1ed7e54[m HEAD@{51}: checkout: moving from dev to youhua_order
[33md56efe83[m HEAD@{52}: checkout: moving from youhua_order to dev
[33mb1ed7e54[m HEAD@{53}: checkout: moving from dev to youhua_order
[33md56efe83[m HEAD@{54}: checkout: moving from youhua_order to dev
[33mb1ed7e54[m HEAD@{55}: commit: 擴展同步調整
[33m1167588f[m HEAD@{56}: checkout: moving from dev to youhua_order
[33md56efe83[m HEAD@{57}: merge origin/dev: Fast-forward
[33mf4ee4cd0[m HEAD@{58}: checkout: moving from youhua_order to dev
[33m1167588f[m HEAD@{59}: checkout: moving from dev to youhua_order
[33mf4ee4cd0[m HEAD@{60}: checkout: moving from youhua_order to dev
[33m1167588f[m HEAD@{61}: commit: 計算折扣調整
[33m7cd416c8[m HEAD@{62}: checkout: moving from dev to youhua_order
[33mf4ee4cd0[m HEAD@{63}: commit: 1、餐檯模式餐種過濾
[33m5064a31b[m HEAD@{64}: merge origin/dev: Fast-forward
[33m24b6de23[m HEAD@{65}: commit: 1、新增餐檯模式餐種 2、細項/套餐組要可以 一起滑動 3、獲取支付方式接口新增上傳 payType字段
[33m5f1d9219[m HEAD@{66}: merge origin/dev: Fast-forward
[33m52ac7855[m HEAD@{67}: reset: moving to HEAD
[33m52ac7855[m HEAD@{68}: checkout: moving from youhua_order to dev
[33m7cd416c8[m HEAD@{69}: commit: 優化調整
[33me5e4e2e3[m HEAD@{70}: checkout: moving from pre-master to youhua_order
[33m0e7eee97[m[33m ([m[1;31morigin/pre-master[m[33m, [m[1;32mpre-master[m[33m)[m HEAD@{71}: checkout: moving from dev to pre-master
[33m52ac7855[m HEAD@{72}: checkout: moving from pre-master to dev
[33m0e7eee97[m[33m ([m[1;31morigin/pre-master[m[33m, [m[1;32mpre-master[m[33m)[m HEAD@{73}: commit: 預發佈分支測試
[33m52ac7855[m HEAD@{74}: checkout: moving from dev to pre-master
[33m52ac7855[m HEAD@{75}: commit: 解決沽清食品組高度問題
[33mbc78c384[m HEAD@{76}: commit: 1、所有activity默認設置成豎屏 如果是平板根據系統走
[33m02eff0af[m HEAD@{77}: merge origin/dev: Fast-forward
[33m7b53780d[m HEAD@{78}: reset: moving to HEAD
[33m7b53780d[m HEAD@{79}: merge origin/dev: Fast-forward
[33ma425afdd[m HEAD@{80}: reset: moving to HEAD
[33ma425afdd[m HEAD@{81}: checkout: moving from youhua_order to dev
[33me5e4e2e3[m HEAD@{82}: checkout: moving from dev to youhua_order
[33ma425afdd[m HEAD@{83}: commit: 1、設置手機不可橫屏
[33m9c26422f[m HEAD@{84}: commit: 1、餐牌送單信息不跳轉新增訂單頁 2、新增訂單彈出選擇人數框
[33m1ee70207[m HEAD@{85}: checkout: moving from youhua_order to dev
[33me5e4e2e3[m HEAD@{86}: commit: 提交下修改
[33ma67d4d52[m HEAD@{87}: checkout: moving from dev to youhua_order
[33m1ee70207[m HEAD@{88}: commit: 修改table-module下包名
[33m750a0147[m HEAD@{89}: commit: 增加其他組件跳轉餐牌頁
[33m012c9448[m HEAD@{90}: commit: 新增外賣訂單跳轉
[33mcc2bb8ac[m HEAD@{91}: checkout: moving from youhua_order to dev
[33ma67d4d52[m HEAD@{92}: commit: 優化餐檯下單流程中...
[33mc4d8a6b5[m HEAD@{93}: commit: 新增餐牌下單相關類
[33me0116d7f[m HEAD@{94}: checkout: moving from dev to youhua_order
[33mcc2bb8ac[m HEAD@{95}: checkout: moving from youhua_order to dev
[33me0116d7f[m HEAD@{96}: commit: -m餐廳擴展調整
[33mcc2bb8ac[m HEAD@{97}: checkout: moving from dev to youhua_order
[33mcc2bb8ac[m HEAD@{98}: commit: 1、食品組 食品 細項 折扣寬高行列字體大小可配置
[33mf142c320[m HEAD@{99}: commit: 1、修改餐廳擴展類
[33ma5b63f95[m HEAD@{100}: merge origin/dev: Fast-forward
[33mb3a9216f[m HEAD@{101}: reset: moving to HEAD
[33mb3a9216f[m HEAD@{102}: commit: 1、點1個單點食物>正常
[33md2117b69[m HEAD@{103}: checkout: moving from master to dev
[33m5c281d9e[m HEAD@{104}: reset: moving to HEAD
[33m5c281d9e[m HEAD@{105}: clone: from http://gitlab.ricepon.com/ningbin/GSA-Cloud.git
