Commits · 66890d15de49ce7cdf2466f2cfc2373c8341f0f6 · Wyh / supplier

30 May, 2020 2 commits
- 5.30 切換環境問題 · 66890d15
  Wyh committed May 30, 2020
  
  66890d15 Browse Files
- 5.30 提交 · 1c6d730d
  Wyh committed May 30, 2020
  
  1c6d730d Browse Files
26 May, 2020 1 commit
- 5.26 外賣接單取消物流，取消訂單，打印機邏輯，服務器配置 · 04c3d010
  Wyh committed May 26, 2020
  
  04c3d010 Browse Files
21 May, 2020 2 commits
- 5.21接單部分問題修復，首頁功能列表隱藏 · 43817993
  Wyh committed May 21, 2020
  
  43817993 Browse Files
- Merge branch 'master' of D:\AsProject\GSA-Cloud with conflicts. · 8b376a1f
  Wyh committed May 21, 2020
  
  8b376a1f Browse Files
18 May, 2020 1 commit
- 添加QMUI相關模塊,修改base模塊名稱 · fb92adad
  宁斌 committed May 18, 2020
  
  fb92adad Browse Files
15 May, 2020 1 commit
- 修改模塊名稱 · 8fdd3fee
  宁斌 committed May 15, 2020
  
  8fdd3fee Browse Files
14 May, 2020 1 commit
- 新增餐檯管理頁，細項多選添加到最後面 · 261b3c34
  宁斌 committed May 14, 2020
  
  261b3c34 Browse Files
09 May, 2020 4 commits
- 1、新增沽清管理 · 77a16245
```
2、新增賬單小數
```
  宁斌 committed May 09, 2020
  77a16245 Browse Files
- Merge remote-tracking branch 'origin/master' · a10ed4c4
```
# Conflicts:
#	print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
#	user-login/src/main/debug/AndroidManifest.xml
```
  宁斌 committed May 09, 2020
  a10ed4c4 Browse Files
- 1、新增沽清管理 · 1e1dee0d
```
2、新增賬單小數
```
  宁斌 committed May 09, 2020
  1e1dee0d Browse Files
- 5.09 接單已完成，正在修改prj打印 · fd2e5345
  Wyh committed May 09, 2020
  
  fd2e5345 Browse Files
30 Apr, 2020 2 commits
- Merge remote-tracking branch 'origin/master' · fd30c52f
  Wyh committed Apr 30, 2020
  
  fd30c52f Browse Files
- 4.29 接單第三方物流，獲取打印機邏輯修改 · 0715edf7
  Wyh committed Apr 30, 2020
  
  0715edf7 Browse Files
28 Apr, 2020 1 commit
- 1、新增沽清頁 · 28b1c416
  宁斌 committed Apr 28, 2020
  
  28b1c416 Browse Files
27 Apr, 2020 3 commits

1、完善賬單食品折扣 · ffb75ea0
```
2、新增公共細項
3、彈窗風格統一
```
宁斌 committed Apr 27, 2020
ffb75ea0 Browse Files

Merge remote-tracking branch 'origin/master' · 444f32a4

# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
#	public-base/src/main/res/values/attrs.xml

committed Apr 27, 2020

444f32a4 Browse Files

1、完善賬單食品折扣 · ce264d78
```
2、新增公共細項
3、彈窗風格統一
```
宁斌 committed Apr 27, 2020
ce264d78 Browse Files

25 Apr, 2020 1 commit
- 4.25 接單已完成 · 2da52ed5
  Wyh committed Apr 25, 2020
  
  2da52ed5 Browse Files
24 Apr, 2020 1 commit
- 4.24 接單已完成 · c9784e1c
  Wyh committed Apr 24, 2020
  
  c9784e1c Browse Files
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 1 commit
- 修改訂單 · 62672cb9
  宁斌 committed Mar 19, 2020
  
  62672cb9 Browse Files