Commits · 4cce725c15be7c93eb01b3423067eaece1c63fbf · Wyh / supplier

31 Oct, 2020 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · 4cce725c
  Wyh committed Oct 31, 2020
  
  4cce725c Browse Files
- 1、PRJ重印優化 2、餐牌一些頁面提交 3、在android 8.0設備上activity不能設置為透明且方向固定 · f947efa6
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 31, 2020
  f947efa6 Browse Files
30 Oct, 2020 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · 1288870b
  宁斌 committed Oct 30, 2020
  
  1288870b Browse Files
- 處理餐檯開台時間格式問題導致閃退 · ad8f3296
  宁斌 committed Oct 30, 2020
  
  ad8f3296 Browse Files
27 Oct, 2020 1 commit
- 1、修復PRJ查詢重印BUG 2、修改餐廳配置頁面優化 · 9bcd4150
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 27, 2020
  9bcd4150 Browse Files
24 Oct, 2020 1 commit
- 1、優化prj查詢頁面 2、prj重印數據優化 3、全局錯誤拋出詳細信息 · f40e4ed7
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 24, 2020
  f40e4ed7 Browse Files
23 Oct, 2020 1 commit
- 新增餐牌選中食品字體配置 · 5aab5e4e
  宁斌 committed Oct 23, 2020
  
  5aab5e4e Browse Files
22 Oct, 2020 5 commits
- Merge remote-tracking branch 'origin/dev' into dev · db7e0360
  宁斌 committed Oct 22, 2020
  
  db7e0360 Browse Files
- 2、查詢prj功能 · 2b1ed606
  宁斌 committed Oct 22, 2020
  
  2b1ed606 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · c7d7592a
  Wyh committed Oct 22, 2020
  
  c7d7592a Browse Files
- 1.限制時間範圍的選擇器 2、查詢prj功能 3、新訂單優化 · a7b7159a
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 22, 2020
  a7b7159a Browse Files
- 餐牌默認字體大小調整 · e75ec7a3
  宁斌 committed Oct 22, 2020
  
  e75ec7a3 Browse Files
21 Oct, 2020 1 commit
- 餐廳擴展同步完善 · aa267293
  宁斌 committed Oct 21, 2020
  
  aa267293 Browse Files
20 Oct, 2020 1 commit
- 餐廳庫擴類拆分 · 81e309bb
  宁斌 committed Oct 20, 2020
  
  81e309bb Browse Files
17 Oct, 2020 8 commits
- Merge remote-tracking branch 'origin/dev' into dev · d56efe83
  Wyh committed Oct 17, 2020
  
  d56efe83 Browse Files
- 外送/自取未配置功能權限時，不顯示右上角的三個點 · 6ebd2599
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 17, 2020
  6ebd2599 Browse Files
- 1、餐檯模式餐種過濾 · f4ee4cd0
  宁斌 committed Oct 17, 2020
  
  f4ee4cd0 Browse Files
- 外送添加payType類型 · 5064a31b
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 17, 2020
  5064a31b Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 1d75bbad
  Wyh committed Oct 17, 2020
  
  1d75bbad Browse Files
- 1、外送歷史訂單、新訂單權限控制 2、新訂單功能完善 · ce9758c9
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 17, 2020
  ce9758c9 Browse Files
- 1、新增餐檯模式餐種 2、細項/套餐組要可以一起滑動 3、獲取支付方式接口新增上傳 payType字段 · 24b6de23
  宁斌 committed Oct 17, 2020
  
  24b6de23 Browse Files
- 1、預發佈環境 2、地址列表頁面 3、凍鏈下載文檔顯示加載框 · 5f1d9219
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 17, 2020
  5f1d9219 Browse Files
16 Oct, 2020 9 commits
- 解決沽清食品組高度問題 · 52ac7855
  宁斌 committed Oct 16, 2020
  
  52ac7855 Browse Files
- 1、所有activity默認設置成豎屏如果是平板根據系統走 · bc78c384
  宁斌 committed Oct 16, 2020
  
  bc78c384 Browse Files
- 獲取配置方法 · 02eff0af
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 16, 2020
  02eff0af Browse Files
- 新訂單 · 7b53780d
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 16, 2020
  7b53780d Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 8919d4f9
```
# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/bean/RiceponAddOrderBean.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
```
  Wyh committed Oct 16, 2020
  8919d4f9 Browse Files
- 1、設置手機不可橫屏 · a425afdd
  宁斌 committed Oct 16, 2020
  
  a425afdd Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · aecc7e06
```
# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/RestaurantExpandInfoUtils.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/ColorBeanDao.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/table/RiceponAddOrderBean.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
```
  Wyh committed Oct 16, 2020
  aecc7e06 Browse Files
- 1、廚房單打印問題 2、新訂單功能 · 2752e44f
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 16, 2020
  2752e44f Browse Files
- 1、餐牌送單信息不跳轉新增訂單頁 2、新增訂單彈出選擇人數框 · 9c26422f
  宁斌 committed Oct 16, 2020
  
  9c26422f Browse Files
15 Oct, 2020 6 commits
- 修改table-module下包名 · 1ee70207
  宁斌 committed Oct 15, 2020
  
  1ee70207 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 7878b112
  Wyh committed Oct 15, 2020
  
  7878b112 Browse Files
- 增加其他組件跳轉餐牌頁 · 750a0147
  宁斌 committed Oct 15, 2020
  
  750a0147 Browse Files
- 新增外賣訂單跳轉 · 012c9448
  宁斌 committed Oct 15, 2020
  
  012c9448 Browse Files
- 10.15 廚房單顯示頭單、統計數 · a09643b6
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 15, 2020
  a09643b6 Browse Files
- 10.15 1、BBpos打印印單、上菜紙、處方單 2、PRJ打印頁數優化 3、新訂單頁面 · 5e45c2a8
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 15, 2020
  5e45c2a8 Browse Files
14 Oct, 2020 1 commit
- 1、食品組食品細項折扣寬高行列字體大小可配置 · cc2bb8ac
  宁斌 committed Oct 14, 2020
  
  cc2bb8ac Browse Files
13 Oct, 2020 2 commits
- 1、修改餐廳擴展類 · f142c320
  宁斌 committed Oct 13, 2020
  
  f142c320 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · a5b63f95
```
# Conflicts:
#	base-module/build.gradle
#	gradle.properties
```
  Wyh committed Oct 13, 2020
  a5b63f95 Browse Files