Commits · f2cee8a57e18b9be730ef310719b3d552c488551 · Wyh / supplier

07 Mar, 2020 2 commits

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

# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	public-base/build.gradle
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
#	user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java

committed Mar 07, 2020

f2cee8a5 Browse Files

調整add食品接口結構 · 240616a2
宁斌 committed Mar 07, 2020

240616a2 Browse Files

06 Mar, 2020 4 commits
- 3-06 登陸UI優化，創建訂單添加餐廳id，商米第一次打印不出問題，商米打印寬度問題 · b6f967f6
  王宇航 committed Mar 06, 2020
  
  b6f967f6 Browse Files
- 3-06 登陸UI優化 · 8300e096
  王宇航 committed Mar 06, 2020
  
  8300e096 Browse Files
- Merge remote-tracking branch 'origin/master' · 8dcec7ed
```
# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
```
  宁斌 committed Mar 06, 2020
  8dcec7ed Browse Files
- 調整創建訂單食品結構 · 6806a379
  宁斌 committed Mar 06, 2020
  
  6806a379 Browse Files
05 Mar, 2020 1 commit
- 3-05 解決N5打印問題，登陸UI優化 · 7fc67f14
  王宇航 committed Mar 05, 2020
  
  7fc67f14 Browse Files
04 Mar, 2020 2 commits
- 添加清機頁面 · 142fb551
  宁斌 committed Mar 04, 2020
  
  142fb551 Browse Files
- 3-04 · 4522d151
  王宇航 committed Mar 04, 2020
  
  4522d151 Browse Files
03 Mar, 2020 2 commits
- 3-3 · 35b7599f
  王宇航 committed Mar 03, 2020
  
  35b7599f Browse Files
- 1、已下單食品點擊一個全部選中問題 · cfa82849
  宁斌 committed Mar 03, 2020
  
  cfa82849 Browse Files
29 Feb, 2020 9 commits
- Merge remote-tracking branch 'origin/master' · e4ae7b9b
  宁斌 committed Feb 29, 2020
  
  e4ae7b9b Browse Files
- 1、單點登錄跳轉調整 · 76f945d5
  宁斌 committed Feb 29, 2020
  
  76f945d5 Browse Files
- 添加切換服務器頁面 · fad94245
  王宇航 committed Feb 29, 2020
  
  fad94245 Browse Files
- Merge remote-tracking branch 'origin/master' · 3b6c598e
  王宇航 committed Feb 29, 2020
  
  3b6c598e Browse Files
- 1、單點登錄提示處理 · fb8a4454
```
2、套餐細項顯示問題調整
3、虛擬鍵盤顯示適配
4、結賬未送單直接 結賬邏輯調整
```
  宁斌 committed Feb 29, 2020
  fb8a4454 Browse Files
- 1、單點登錄提示處理 · c8cc006c
```
2、套餐細項顯示問題調整
3、虛擬鍵盤顯示適配
4、結賬未送單直接 結賬邏輯調整
```
  宁斌 committed Feb 29, 2020
  c8cc006c Browse Files
- 不能ip打印問題，打印時間格式問題 · 9455d475
  王宇航 committed Feb 29, 2020
  
  9455d475 Browse Files
- 2020-02-29 · 0c0053e4
  王宇航 committed Feb 29, 2020
  
  0c0053e4 Browse Files
- 1、套餐細項顯示及表調整 · 2718aa3f
```
2、未送單直接結賬 導致結賬失敗問題
```
  宁斌 committed Feb 29, 2020
  2718aa3f Browse Files
28 Feb, 2020 1 commit

1、餐牌食品組分頁調整 · 72663cb3

2、打印回調不成功處理
3、數據下載頁面調整
4、獲取支付方式接口替換

committed Feb 28, 2020

72663cb3 Browse Files

26 Feb, 2020 5 commits
- 三張報表數據 · 6c4562f5
  王宇航 committed Feb 26, 2020
  
  6c4562f5 Browse Files
- 營業報表數據、打印回調 · 3f8eda10
  王宇航 committed Feb 26, 2020
  
  3f8eda10 Browse Files
- 首頁報表數據填充完成、登陸頁面edittext修改，添加logo，打印回調 · 7b954ba2
  王宇航 committed Feb 26, 2020
  
  7b954ba2 Browse Files
- 首頁報表數據填充完成、登陸頁面edittext修改，添加logo，打印回調 · d9771649
  王宇航 committed Feb 26, 2020
  
  d9771649 Browse Files
- 首頁報表數據填充完成、登陸頁面edittext修改，添加logo，打印回調 · b7bddad0
  王宇航 committed Feb 26, 2020
  
  b7bddad0 Browse Files
25 Feb, 2020 3 commits
- 登陸框修改 · bfeeddea
  王宇航 committed Feb 25, 2020
  
  bfeeddea Browse Files
- 首頁三張報表UI · 52572e0b
  王宇航 committed Feb 25, 2020
  
  52572e0b Browse Files
- 首頁三張報表UI · 19751895
  王宇航 committed Feb 25, 2020
  
  19751895 Browse Files
24 Feb, 2020 2 commits

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

# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	print-module/src/main/java/com/joe/print/mvp/print/Print.java
#	user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java

committed Feb 24, 2020

ad92fa90 Browse Files

添加打印機失敗問題 · 38f09a7b
王宇航 committed Feb 24, 2020

38f09a7b Browse Files

23 Feb, 2020 1 commit
- 1、調整 android 9無法調整首頁問題 · 52042c50
```
2、新增點擊首頁標題重選品牌餐廳
```
  宁斌 committed Feb 23, 2020
  52042c50 Browse Files
22 Feb, 2020 8 commits
- ip打印 · e799c8b5
  王宇航 committed Feb 22, 2020
  
  e799c8b5 Browse Files
- 1、新增轉台 · 3acc2de9
  宁斌 committed Feb 22, 2020
  
  3acc2de9 Browse Files
- Merge remote-tracking branch 'origin/master' · 57ee9e10
```
# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/MainTopFragment.java
#	public-base/build.gradle
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/callback/CommandImpl.java
```
  宁斌 committed Feb 22, 2020
  57ee9e10 Browse Files
- 1、新增轉台 · c5329aba
  宁斌 committed Feb 22, 2020
  
  c5329aba Browse Files
- 廚房單打印切紙,首頁標題欄不滑動 · 5e0ba6b0
  王宇航 committed Feb 22, 2020
  
  5e0ba6b0 Browse Files
- 廚房單打印切紙 · d77dea18
  王宇航 committed Feb 22, 2020
  
  d77dea18 Browse Files
- Merge remote-tracking branch 'origin/master' · a1cd212f
```
# Conflicts:
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
```
  王宇航 committed Feb 22, 2020
  a1cd212f Browse Files
- 首頁側滑登出、廚房單打印 · e8c65531
  王宇航 committed Feb 22, 2020
  
  e8c65531 Browse Files