Commits · 1131cf143c674b76e5e684e06aae7c2affe0bdf9 · Wyh / supplier

05 Jun, 2020 1 commit
- 6.05 自取單問題，添加配送優化 · 1131cf14
  Wyh committed Jun 05, 2020
  
  1131cf14 Browse Files
04 Jun, 2020 4 commits
- 6.04 打印字體大小調整 · 56996a7f
  Wyh committed Jun 04, 2020
  
  56996a7f Browse Files
- 6.04 排除簡體字 · c2952086
  Wyh committed Jun 04, 2020
  
  c2952086 Browse Files
- 6.04 物流單不顯示結賬按鈕，打印格式修改 · c1f49685
  Wyh committed Jun 04, 2020
  
  c1f49685 Browse Files
- 6.04 修改了支付 · 97e038cb
  Wyh committed Jun 04, 2020
  
  97e038cb Browse Files
03 Jun, 2020 3 commits
- 6.03 去掉log日誌 · 013a3e91
  Wyh committed Jun 03, 2020
  
  013a3e91 Browse Files
- 6.03 替換了修改訂單狀態接口 · 50628e65
  Wyh committed Jun 03, 2020
  
  50628e65 Browse Files
- 环境切换调整引导图，logo替换 · b343ab48
  宁斌 committed Jun 03, 2020
  
  b343ab48 Browse Files
02 Jun, 2020 10 commits
- Merge remote-tracking branch 'origin/master' · 221a97de
  Wyh committed Jun 02, 2020
  
  221a97de Browse Files
- 上次清机时间修改 · 25fcbe09
  宁斌 committed Jun 02, 2020
  
  25fcbe09 Browse Files
- 切換環境頁面問題處理 · a1de44ce
  宁斌 committed Jun 02, 2020
  
  a1de44ce Browse Files
- Merge remote-tracking branch 'origin/master' · 98c2ce0a
  Wyh committed Jun 02, 2020
  
  98c2ce0a Browse Files
- 清機調整 · c47eb4df
  宁斌 committed Jun 02, 2020
  
  c47eb4df Browse Files
- Merge remote-tracking branch 'origin/master' · 7e948be5
```
# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
```
  Wyh committed Jun 02, 2020
  7e948be5 Browse Files
- 6.2 · 181d2f99
  Wyh committed Jun 02, 2020
  
  181d2f99 Browse Files
- 1、清機調整 · b7c9e6a9
  宁斌 committed Jun 02, 2020
  
  b7c9e6a9 Browse Files
- 清機數據調整2 · c96f96c8
  宁斌 committed Jun 02, 2020
  
  c96f96c8 Browse Files
- 清機數據調整 · 1507007e
  宁斌 committed Jun 02, 2020
  
  1507007e Browse Files
30 May, 2020 6 commits
- Merge remote-tracking branch 'origin/master' · d387c37a
  宁斌 committed May 30, 2020
  
  d387c37a Browse Files
- 1、获取总金额过滤方法调整 · 25be8c4b
  宁斌 committed May 30, 2020
  
  25be8c4b Browse Files
- 5.30 切換環境問題 · 66890d15
  Wyh committed May 30, 2020
  
  66890d15 Browse Files
- Merge remote-tracking branch 'origin/master' · 79a55f43
```
# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
```
  宁斌 committed May 30, 2020
  79a55f43 Browse Files
- 新增餐台服务费 · 21087f3c
  宁斌 committed May 30, 2020
  
  21087f3c 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
23 May, 2020 2 commits
- Merge remote-tracking branch 'origin/master' · 2229211e
```
# Conflicts:
#	print-module/src/main/java/com/joe/print/mvp/ui/fragment/IpPrintListActivityFragment.java
```
  宁斌 committed May 23, 2020
  2229211e Browse Files
- 餐檯區域增刪改查操作 · 082ce5f0
  宁斌 committed May 23, 2020
  
  082ce5f0 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 1 commit
- 1、完善賬單食品折扣 · ffb75ea0
```
2、新增公共細項
3、彈窗風格統一
```
  宁斌 committed Apr 27, 2020
  ffb75ea0 Browse Files