[33m66c18f257[m[33m ([m[1;36mHEAD -> [m[1;32mdev[m[33m)[m HEAD@{0}: commit: 1、N5支付，小費，退款，取消完善 2、餐檯模式送單第三層細項消失
[33m0cb22cb86[m HEAD@{1}: merge origin/dev: Merge made by the 'recursive' strategy.
[33m367cd0b3d[m HEAD@{2}: reset: moving to HEAD
[33m367cd0b3d[m HEAD@{3}: commit (merge): Merge remote-tracking branch 'origin/dev' into dev
[33mbf82ac4d1[m HEAD@{4}: reset: moving to HEAD
[33mbf82ac4d1[m HEAD@{5}: commit: 修改訂單刪除食品-》結賬 沒有提示先送單問題
[33m4b0e819ff[m HEAD@{6}: commit (merge): Merge remote-tracking branch 'origin/dev' into dev
[33md3cc4b0fd[m HEAD@{7}: reset: moving to HEAD
[33md3cc4b0fd[m HEAD@{8}: commit: 賬單管理功能button調整，N5支付取消，退款，補小費
[33mb4efd6e3a[m HEAD@{9}: commit: 完事N5支付，退款，取消，補消費，重查詢實現類編寫；N5支付，補小費調用
[33m1c9b187e3[m HEAD@{10}: commit: 1、項目結構整理，2、添加獲取deviceId方案
[33m69346e659[m HEAD@{11}: commit: 1、項目結構整理，2、添加獲取deviceId方案
[33m5d2696f18[m HEAD@{12}: checkout: moving from recoder to dev
[33m493bcad80[m[33m ([m[1;32mrecoder[m[33m)[m HEAD@{13}: checkout: moving from dev to recoder
[33m5d2696f18[m HEAD@{14}: commit (merge): 代碼整合
[33m493bcad80[m[33m ([m[1;32mrecoder[m[33m)[m HEAD@{15}: checkout: moving from recoder to dev
[33m493bcad80[m[33m ([m[1;32mrecoder[m[33m)[m HEAD@{16}: checkout: moving from dev to recoder
[33m493bcad80[m[33m ([m[1;32mrecoder[m[33m)[m HEAD@{17}: commit: 1、項目模塊整理；2、餐檯模式送單新增成本價
[33mab94d949f[m[33m ([m[1;32mmaster[m[33m)[m HEAD@{18}: merge master: Fast-forward
[33me84ec8853[m HEAD@{19}: checkout: moving from master to dev
[33mab94d949f[m[33m ([m[1;32mmaster[m[33m)[m HEAD@{20}: commit: 堂食打印實體適配類
[33ma64b7e94e[m[33m ([m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{21}: commit (merge): Merge branch 'dev' into master
[33m80c5981ff[m HEAD@{22}: checkout: moving from dev to master
[33me84ec8853[m HEAD@{23}: checkout: moving from master to dev
[33m80c5981ff[m HEAD@{24}: commit: 1.1.2，1.1.3正式版
[33m6597cebe6[m HEAD@{25}: checkout: moving from dev to master
[33me84ec8853[m HEAD@{26}: reset: moving to HEAD
[33me84ec8853[m HEAD@{27}: commit: bbpos打印堂食印單，結賬單調整
[33m9029ddf26[m HEAD@{28}: commit: bbpos打印細節調整，新增擴展自動（點選支付方式是否彈出輸入框，餐檯模式開檯自動彈出輸入人數彈窗）
[33m70d850240[m HEAD@{29}: commit: bbpos打印調整
[33mfb2f2dca6[m HEAD@{30}: commit: 外賣接單 結賬單，外賣接單 印單
[33m922cde776[m HEAD@{31}: commit: bbpos結賬單，qrcode打印處理
[33md7c21e361[m HEAD@{32}: commit: Compontent統一到base模塊下，xfunction相關處理
[33m02ccf7deb[m HEAD@{33}: merge origin/dev: Fast-forward
[33m17ab71e19[m HEAD@{34}: reset: moving to HEAD
[33m17ab71e19[m HEAD@{35}: commit (merge): Merge remote-tracking branch 'origin/dev' into dev
[33m117ee1004[m HEAD@{36}: merge youhuajiegou: Fast-forward
[33mf99df214f[m HEAD@{37}: checkout: moving from youhuajiegou to dev
[33m117ee1004[m HEAD@{38}: commit: 1、新增功能管理相關類 2、Logan相關類調整
[33mc4e6855da[m HEAD@{39}: commit: 1、統一網絡請求頭HeadersInterceptor 2、加入美團日誌框架logan對（網絡請求，頁面生命週期）進行埋點 3、增加user狀態管理類
[33mf99df214f[m HEAD@{40}: checkout: moving from dev to youhuajiegou
[33mf99df214f[m HEAD@{41}: commit: 餐檯輪訓調整
[33m2abd64bd2[m HEAD@{42}: commit (merge): Merge remote-tracking branch 'origin/dev' into dev
[33m1d233a8d7[m HEAD@{43}: commit: 食品支持多个折扣 接口结构调整
[33mbd5562ed3[m HEAD@{44}: commit: 部分javabean名稱修改，打印skyorder流程處理
[33mc6a57b395[m HEAD@{45}: merge origin/dev: Fast-forward
[33mc9d2faed9[m HEAD@{46}: reset: moving to HEAD
[33mc9d2faed9[m HEAD@{47}: commit: 添加哆啦A夢插件，skorder模式長按鎖定
[33m90a3fc052[m HEAD@{48}: checkout: moving from master to dev
[33m6597cebe6[m HEAD@{49}: commit: 1.1.1正式版
[33m547e42b57[m HEAD@{50}: checkout: moving from dev to master
[33m90a3fc052[m HEAD@{51}: commit: 添加skyorder打印類
[33m7a38c978d[m HEAD@{52}: merge skyorder: Fast-forward
[33m9ca88b207[m HEAD@{53}: checkout: moving from skyorder to dev
[33m7a38c978d[m HEAD@{54}: commit: 添加滴滴 哆啦A夢框架，skyorder打印二維碼
[33m9ca88b207[m HEAD@{55}: checkout: moving from dev to skyorder
[33m9ca88b207[m HEAD@{56}: merge skyorder: Fast-forward
[33mfa4a065df[m HEAD@{57}: checkout: moving from skyorder to dev
[33m9ca88b207[m HEAD@{58}: commit: skyorder打印處理 新增哆啦A夢:滴滴開源工具（辅助开发工具、测试效率工具、视觉辅助工具）
[33m654437d80[m HEAD@{59}: commit: 修改餐廳操作相關類
[33mfa4a065df[m HEAD@{60}: checkout: moving from dev to skyorder
[33mfa4a065df[m HEAD@{61}: checkout: moving from skyorder to dev
[33mfa4a065df[m HEAD@{62}: checkout: moving from dev to skyorder
[33mfa4a065df[m HEAD@{63}: commit: 增加skyorder打印頁
[33ma18674719[m HEAD@{64}: commit: 添加skyokrder打印頁面UI
[33m6e91dc543[m HEAD@{65}: commit (merge): Merge branch 'youhua' into dev
[33m8366fd1e1[m HEAD@{66}: merge master: Merge made by the 'recursive' strategy.
[33m4cce725c1[m HEAD@{67}: checkout: moving from youhua to dev
[33mce4cd6d7f[m HEAD@{68}: checkout: moving from dev to youhua
[33m4cce725c1[m HEAD@{69}: merge origin/dev: Fast-forward
[33me75ec7a39[m HEAD@{70}: checkout: moving from master to dev
[33m547e42b57[m HEAD@{71}: pull --progress --no-stat -v --progress origin master: Fast-forward
[33m5c281d9e8[m HEAD@{72}: checkout: moving from youhua to master
[33mce4cd6d7f[m HEAD@{73}: commit: 引入rxjava工具類
[33m0d0fc54b6[m HEAD@{74}: commit: 1、按返回沒有彈出提示 尚有食物未送單,是否不保存返回 2、修改沒有找到會員提示 3、美化一下，按進細項，這數字建盤飛起來了
[33m525c4defc[m HEAD@{75}: commit: 折扣增加：上限，獨佔，暫停，只一次，最小賬單金額邏輯
[33maa04da1b4[m HEAD@{76}: commit: 增加折扣邏輯
[33m5dd126084[m HEAD@{77}: commit: 添加loadsir頁面反饋管理
[33ma40f7acbe[m HEAD@{78}: commit: 修改數量調整
[33mf47767b0a[m HEAD@{79}: commit: 賬單優化處理
[33m1a28da3bc[m HEAD@{80}: commit: 餐檯下單優化
[33md67280691[m HEAD@{81}: commit: order-base模塊代碼遷移
[33m27732b86d[m HEAD@{82}: commit: 拆分database模塊
[33me75ec7a39[m HEAD@{83}: checkout: moving from dev to youhua
[33me75ec7a39[m HEAD@{84}: commit: 餐牌默認字體大小調整
[33maa2672937[m HEAD@{85}: checkout: moving from discount to dev
[33maa2672937[m HEAD@{86}: merge dev: Fast-forward
[33m81e309bb8[m HEAD@{87}: checkout: moving from dev to discount
[33maa2672937[m HEAD@{88}: commit: 餐廳擴展同步完善
[33m81e309bb8[m HEAD@{89}: checkout: moving from discount to dev
[33m81e309bb8[m HEAD@{90}: checkout: moving from dev to discount
[33m81e309bb8[m HEAD@{91}: checkout: moving from dev to discount
[33m81e309bb8[m HEAD@{92}: commit: 餐廳庫擴類拆分
[33md56efe839[m HEAD@{93}: merge origin/dev: Fast-forward
[33mf4ee4cd08[m HEAD@{94}: commit: 1、餐檯模式餐種過濾
[33m5064a31bc[m HEAD@{95}: merge origin/dev: Fast-forward
[33m24b6de236[m HEAD@{96}: commit: 1、新增餐檯模式餐種 2、細項/套餐組要可以 一起滑動 3、獲取支付方式接口新增上傳 payType字段
[33m5f1d92195[m HEAD@{97}: merge origin/dev: Fast-forward
[33m52ac78556[m HEAD@{98}: reset: moving to HEAD
[33m0e7eee97a[m[33m ([m[1;31morigin/pre-master[m[33m, [m[1;32mpre-master[m[33m)[m HEAD@{99}: checkout: moving from dev to pre-master
[33m52ac78556[m HEAD@{100}: checkout: moving from pre-master to dev
[33m0e7eee97a[m[33m ([m[1;31morigin/pre-master[m[33m, [m[1;32mpre-master[m[33m)[m HEAD@{101}: commit: 預發佈分支測試
[33m52ac78556[m HEAD@{102}: checkout: moving from dev to pre-master
[33m52ac78556[m HEAD@{103}: commit: 解決沽清食品組高度問題
[33mbc78c3840[m HEAD@{104}: commit: 1、所有activity默認設置成豎屏 如果是平板根據系統走
[33m02eff0af9[m HEAD@{105}: merge origin/dev: Fast-forward
[33m7b53780df[m HEAD@{106}: reset: moving to HEAD
[33m7b53780df[m HEAD@{107}: merge origin/dev: Fast-forward
[33ma425afdda[m HEAD@{108}: reset: moving to HEAD
[33ma425afdda[m HEAD@{109}: commit: 1、設置手機不可橫屏
[33m9c26422fa[m HEAD@{110}: commit: 1、餐牌送單信息不跳轉新增訂單頁 2、新增訂單彈出選擇人數框
[33m1ee702079[m HEAD@{111}: commit: 修改table-module下包名
[33m750a0147b[m HEAD@{112}: commit: 增加其他組件跳轉餐牌頁
[33m012c9448d[m HEAD@{113}: commit: 新增外賣訂單跳轉
[33mcc2bb8ac1[m HEAD@{114}: checkout: moving from dev to youhua_order
[33mcc2bb8ac1[m HEAD@{115}: commit: 1、食品組 食品 細項 折扣寬高行列字體大小可配置
[33mf142c320a[m HEAD@{116}: commit: 1、修改餐廳擴展類
[33ma5b63f953[m HEAD@{117}: merge origin/dev: Fast-forward
[33mb3a9216f1[m HEAD@{118}: reset: moving to HEAD
[33mb3a9216f1[m HEAD@{119}: commit: 1、點1個單點食物>正常
[33md2117b697[m HEAD@{120}: checkout: moving from master to dev
[33m5c281d9e8[m HEAD@{121}: reset: moving to HEAD
