Commits · 4222a1bff659f64b5ae35466816f431d8111529f · Wyh / supplier

11 Apr, 2020 6 commits
- 04-11 修改打印問題 · 4222a1bf
  Wyh committed Apr 11, 2020
  
  4222a1bf Browse Files
- 04-11 打印問題修復 · 367c421b
  Wyh committed Apr 11, 2020
  
  367c421b Browse Files
- Merge remote-tracking branch 'origin/master' · 1354332c
  Wyh committed Apr 11, 2020
  
  1354332c Browse Files
- 1、添加賬單折扣 · 9c403202
```
2、添加食品折扣
3、套餐最大數限制
```
  宁斌 committed Apr 11, 2020
  9c403202 Browse Files
- 04-11打印提示測試失敗 · e945e7ce
  Wyh committed Apr 11, 2020
  
  e945e7ce Browse Files
- 04-11 多台打印，長按印單切換打印機 · 414e7e7d
  Wyh committed Apr 11, 2020
  
  414e7e7d Browse Files
10 Apr, 2020 1 commit
- Merge remote-tracking branch 'origin/master' · 3bebf347
  Wyh committed Apr 10, 2020
  
  3bebf347 Browse Files
07 Apr, 2020 1 commit
- 1、取消新增原因數量選擇 · 8dbe5c8f
```
2、食品轉移
```
  宁斌 committed Apr 07, 2020
  8dbe5c8f Browse Files
06 Apr, 2020 1 commit
- 04-06 修改打印邏輯前 · da93bfc3
  Wyh committed Apr 06, 2020
  
  da93bfc3 Browse Files
02 Apr, 2020 1 commit
- 04-02 長連接接單模塊提交 · 0fd819b0
  Wyh committed Apr 02, 2020
  
  0fd819b0 Browse Files
31 Mar, 2020 2 commits
- Merge remote-tracking branch 'origin/master' · d54a9745
  Wyh committed Mar 31, 2020
  
  d54a9745 Browse Files
- 1、全部，狀態餐檯頁代碼合併 · bb5e22ac
```
2、結賬接口調整
```
  宁斌 committed Mar 31, 2020
  bb5e22ac Browse Files
28 Mar, 2020 1 commit
- 3-28 長連接接單 · 6587819a
  Wyh committed Mar 28, 2020
  
  6587819a Browse Files
25 Mar, 2020 3 commits
- 3-25 引導頁 · b3a5330a
  Wyh committed Mar 25, 2020
  
  b3a5330a Browse Files
- 3-25 啟動圖，引導頁，其他一些小問題 · f8ac03e3
  Wyh committed Mar 25, 2020
  
  f8ac03e3 Browse Files
- 1、餐檯頁面UI調整 · 9ae76d77
```
2、輸入餐檯頁面UI調整
```
  宁斌 committed Mar 25, 2020
  9ae76d77 Browse Files
21 Mar, 2020 2 commits
- 3-21 首頁滑動優化，本地打印優化，報表顯示優化 · d9d4e87b
  Wyh committed Mar 21, 2020
  
  d9d4e87b Browse Files
- 1、送單新增memberId · eea0ad67
  宁斌 committed Mar 21, 2020
  
  eea0ad67 Browse Files
20 Mar, 2020 1 commit
- 1、賬單管理有時不能打印支付方式 · 88719c53
```
2、清機報表數據錯誤調整
```
  宁斌 committed Mar 20, 2020
  88719c53 Browse Files
19 Mar, 2020 4 commits
- 修改訂單 · 62672cb9
  宁斌 committed Mar 19, 2020
  
  62672cb9 Browse Files
- 3-19 首頁報表滑動，下拉刷新，解決側滑衝突 · daefa31e
  Wyh committed Mar 19, 2020
  
  daefa31e Browse Files
- 3-19 過濾文件增加 · b5aa1786
  Wyh committed Mar 19, 2020
  
  b5aa1786 Browse Files
- 3-19 清機報表字體太小問題 · 066c9656
  Wyh committed Mar 19, 2020
  
  066c9656 Browse Files
18 Mar, 2020 4 commits

Merge remote-tracking branch 'origin/master' · f2fd9308

# Conflicts:
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java

committed Mar 18, 2020

f2fd9308 Browse Files

Merge remote-tracking branch 'origin/master' · dad8710e

# Conflicts:
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderCenterActivity.java

committed Mar 18, 2020

dad8710e Browse Files

1、添加訂單管理（列表，詳情，取消，重印） · 82e6ac03
```
2、啟動頁訪問服務器異常一直停留不動
```
宁斌 committed Mar 18, 2020
82e6ac03 Browse Files
3-18 打印超時時間設置，報表優化 · cf0481a6
Wyh committed Mar 18, 2020

cf0481a6 Browse Files

14 Mar, 2020 6 commits
- 訂單詳情調整 · b5dd920f
  宁斌 committed Mar 14, 2020
  
  b5dd920f Browse Files
- 訂單詳情完善 · dc42b76e
  宁斌 committed Mar 14, 2020
  
  dc42b76e Browse Files
- 新增賬單列表，賬單詳情頁面 · cd58cb90
  宁斌 committed Mar 14, 2020
  
  cd58cb90 Browse Files
- 3-14 打印結賬單，金額錯誤問題 · 7410f941
  Wyh committed Mar 14, 2020
  
  7410f941 Browse Files
- 3-14 清機報表打印、icon適配、打印機列表調整、動態修改服務器地址、處方單打印縮縮進 · f03728f5
  Wyh committed Mar 14, 2020
  
  f03728f5 Browse Files
- 送單食品單價傳總價問題 · 1305e525
  宁斌 committed Mar 14, 2020
  
  1305e525 Browse Files
13 Mar, 2020 1 commit
- 1、申請文件權限放到登錄頁 · e880993e
```
2、清機報表完善
```
  宁斌 committed Mar 13, 2020
  e880993e Browse Files
12 Mar, 2020 2 commits
- 3-12 自動登陸判斷移到啟動頁 · 4a3165d6
  Wyh committed Mar 12, 2020
  
  4a3165d6 Browse Files
- Merge remote-tracking branch 'origin/master' · 7d64d603
```
# Conflicts:
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
```
  Wyh committed Mar 12, 2020
  7d64d603 Browse Files
11 Mar, 2020 4 commits
- 3-11 修復送單打印所有食品問題，添加細項縮進 · 2189429e
  Wyh committed Mar 11, 2020
  
  2189429e Browse Files
- 套餐默認調整，部分報表項數據 · 8bf3e341
  宁斌 committed Mar 11, 2020
  
  8bf3e341 Browse Files
- Merge remote-tracking branch 'origin/master' · 6f150c1a
```
# Conflicts:
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
#	user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java
```
  宁斌 committed Mar 11, 2020
  6f150c1a Browse Files
- 3-11 打印優化。啟動圖，自動登陸，webview適配 · 8dba2f2b
  Wyh committed Mar 11, 2020
  
  8dba2f2b Browse Files