Commits · d5d670d83178280a6d7092bfbfda9d709ecf80fd · Wyh / supplier · GitLab

19 Sep, 2020 1 commit
- 9.19 1.優化切換環境 2、冷鏈切換餐廳營業狀態BUG · d5d670d8
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 19, 2020
  d5d670d8 Browse Files
16 Sep, 2020 2 commits
- 9.16 預約單數量和配置 · f5957536
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 16, 2020
  f5957536 Browse Files
- 9.16 1、改為凍鏈接單 2、打印prj加上頁數 3、預約單數量和配置 · cd3c227f
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 16, 2020
  cd3c227f Browse Files
12 Sep, 2020 1 commit
- 9.12 1、預約單問題 2、prj打印頁數 3、冷鏈歷史訂單 4、冷鏈修改餐廳營業狀態 5、冷鏈搜索問題 6、二維碼模塊問題修改 7、營業報表小數點限制 · 2ceb6509
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 12, 2020
  2ceb6509 Browse Files
11 Sep, 2020 4 commits
- Merge remote-tracking branch 'origin/master' into master · 7d5e8b8b
```
# Conflicts:
#	config.gradle
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
```
  Wyh committed Sep 11, 2020
  7d5e8b8b Browse Files
- 9.11 修改外賣模塊名，冷鏈報錯問題 · 9cda6142
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 11, 2020
  9cda6142 Browse Files
- 1、打印积分二维码问题处理 · 2bcca59b
  宁斌 committed Sep 11, 2020
  
  2bcca59b Browse Files
- 9.11 1、餘額顯示修改 2、刷新餘額 3、新建預點餐模塊 · 182fcbd9
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 11, 2020
  182fcbd9 Browse Files
10 Sep, 2020 1 commit
- 1、外賣自取訂單詳情頁閃退 2、送單打印上菜紙失敗 · e136398a
  宁斌 committed Sep 10, 2020
  
  e136398a Browse Files
09 Sep, 2020 6 commits
- 9.09 1、二維碼頁面BUG修復 2、外送接單顯示餘額問題、餘額刷新問題修復 · b5ccc516
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 09, 2020
  b5ccc516 Browse Files
- 1、删除送单食品问题 · 47147bd1
  宁斌 committed Sep 09, 2020
  
  47147bd1 Browse Files
- 9.09 1、添加二維碼功能 2、餘額查詢接口修改 3、lalamove餘額刷新修改 4、lalamove交通工具名稱讀取後台數據 · 85c7cde7
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 09, 2020
  85c7cde7 Browse Files
- 1、首页切换餐厅名字没变 · b830b7e4
```
2、删除食品完 再次点击删除按钮闪退问题
```
  宁斌 committed Sep 09, 2020
  b830b7e4 Browse Files
- Merge remote-tracking branch 'origin/master' · b9c5dcf3
```
# Conflicts:
#	login-module/src/main/AndroidManifest.xml
#	main-module/src/main/AndroidManifest.xml
#	main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
```
  宁斌 committed Sep 09, 2020
  b9c5dcf3 Browse Files
- 1、餐檯模式使用會員修改 · 19072f96
```
2、删除食品页面， 送单接口调整
3、首页多次登出 再次进入，退出不了应用
```
  宁斌 committed Sep 09, 2020
  19072f96 Browse Files
08 Sep, 2020 1 commit
- 9.08 1、登陸判斷優化 2、外送自取支付接口調整 3、冷鏈顯示訂單數 · 3cc1ca01
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 08, 2020
  3cc1ca01 Browse Files
05 Sep, 2020 1 commit
- 9.05 打印食品文字問題 · 84550b77
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 05, 2020
  84550b77 Browse Files
04 Sep, 2020 1 commit
- 9.04 1、關閉追加服務費 2、冷鏈問題修復 · fa8153f6
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 04, 2020
  fa8153f6 Browse Files
03 Sep, 2020 2 commits
- 9.03 1、PRJ多語言打印 2、打印機增加多語言配置 3、追加服務費邏輯修改 · 1905e41d
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 03, 2020
  1905e41d Browse Files
- 9.03 1、lalamove獲取交通工具接口服務器問題 2、冷鏈圖標 · 106f3d8b
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 03, 2020
  106f3d8b Browse Files
02 Sep, 2020 3 commits
- 9.02 調整佈局 · 6a964e80
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 02, 2020
  6a964e80 Browse Files
- 9.02 1、冷鏈接單 2、lalmove追加服務費 3、顯示餘額 · e3e7e244
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 02, 2020
  e3e7e244 Browse Files
- 1、餐檯模式使用會員處理 · a3e7affc
  宁斌 committed Sep 02, 2020
  
  a3e7affc Browse Files
22 Aug, 2020 5 commits
- Merge remote-tracking branch 'origin/master' · a7c19cb0
  宁斌 committed Aug 22, 2020
  
  a7c19cb0 Browse Files
- 1、餐檯模式部分數據不對問題處理 · 35792031
  宁斌 committed Aug 22, 2020
  
  35792031 Browse Files
- Merge remote-tracking branch 'origin/master' · efb23dc1
  Wyh committed Aug 22, 2020
  
  efb23dc1 Browse Files
- 1、餐檯模式部分數據不對問題處理 · 8ef87d75
  宁斌 committed Aug 22, 2020
  
  8ef87d75 Browse Files
- 8.22 1、外送/自取模塊更名 2、取消外送/自取按鈕權限控制 3、多個頁面加入loading · 1cbb24c5
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 22, 2020
  1cbb24c5 Browse Files
20 Aug, 2020 3 commits
- 8.20 外送人員報表 · 7f69656f
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 20, 2020
  7f69656f Browse Files
- Merge remote-tracking branch 'origin/master' · 1385fdee
```
# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/function/FunctionManager.java
#	base-module/src/main/res/values/ids.xml
#	login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java
```
  Wyh committed Aug 20, 2020
  1385fdee Browse Files
- 8.20 1、優化報錯推送內容 2、每日營業報表 3、新增重新加載view 4、更改選擇餐廳頁面 5、派送員報表 6、新增選擇時間view 7、外送按鈕權限控制 8、修改外送的提示音 · eb12ef4f
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 20, 2020
  eb12ef4f Browse Files
15 Aug, 2020 3 commits
- 功能权限控制完善 · 649170bf
  宁斌 committed Aug 15, 2020
  
  649170bf Browse Files
- 使用会员调整 · 03737d19
  宁斌 committed Aug 15, 2020
  
  03737d19 Browse Files
- 8.15 1、每日營業報表及打印功能 2、外賣接單按鈕權限控制 · 114cb283
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 15, 2020
  114cb283 Browse Files
13 Aug, 2020 3 commits
- 8.13 1、物流取消提示 2、lalamove選擇運輸工具 3、lalamove取消物流後可再次選擇運輸工具 · ea7060d3
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 13, 2020
  ea7060d3 Browse Files
- 8.13 · 275bd337
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 13, 2020
  275bd337 Browse Files
- 8.13 1、PRJ打印新增外賣和自取時間 2、修復USB打印bug 3、添加immersionbar狀態欄工具依賴，修改首頁狀態欄顯示 · cca5a5c7
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 13, 2020
  cca5a5c7 Browse Files
08 Aug, 2020 3 commits
- 8.08 1、外送接單支付方式顯示字段修改 2、更多報表報錯修復 · d48dff72
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 08, 2020
  d48dff72 Browse Files
- Merge remote-tracking branch 'origin/master' · faca8b9d
  Wyh committed Aug 08, 2020
  
  faca8b9d Browse Files
- 8.8 1.新訂單提示音BUG修復 2、外送接單支付方式顯示字段修改 · d258cdd8
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 08, 2020
  d258cdd8 Browse Files