Commits · ebff2d0a08e87e47df6b88a939e86a385d0ef5d0 · order-group-application / order-group · GitLab

18 Sep, 2021 16 commits
- Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of… · ebff2d0a
```
Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

 Conflicts:
	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
```
  蒋小洋 committed Sep 18, 2021
  ebff2d0a Browse Files
- Merge branch '2021年9月15日-开票历史列表接口+详情接口+发票所含订单接口-黄兆良' into qa · fd58a6e8
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhaoliang.huang committed Sep 18, 2021
  fd58a6e8 Browse Files
- 2021年9月18日-开票历史列表接口+详情接口+发票所含订单接口-黄兆良 · dd250592
  zhaoliang.huang committed Sep 18, 2021
  
  dd250592 Browse Files
- 2021年9月18日-开票历史列表接口+详情接口+发票所含订单接口-黄兆良 · d5941a4d
  zhaoliang.huang committed Sep 18, 2021
  
  d5941a4d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · ef9f50d4
  陈斌 committed Sep 18, 2021
  
  ef9f50d4 Browse Files
- 发票url处理 · 7d04bff1
  陈斌 committed Sep 18, 2021
  
  7d04bff1 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · 895ebb7b
  陈斌 committed Sep 18, 2021
  
  895ebb7b Browse Files
- update · 083931cf
  陈斌 committed Sep 18, 2021
  
  083931cf Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · d313c0ff
  陈斌 committed Sep 18, 2021
  
  d313c0ff Browse Files
- update · 34f9639b
  陈斌 committed Sep 18, 2021
  
  34f9639b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · 30f76434
  陈斌 committed Sep 18, 2021
  
  30f76434 Browse Files
- update · 5dfc3122
  陈斌 committed Sep 18, 2021
  
  5dfc3122 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · bdc94e38
  陈斌 committed Sep 18, 2021
  
  bdc94e38 Browse Files
- 订单开票 · 9bd2415e
  陈斌 committed Sep 18, 2021
  
  9bd2415e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · d6dcdbcc
  陈斌 committed Sep 18, 2021
  
  d6dcdbcc Browse Files
- update · b7bebd44
  陈斌 committed Sep 18, 2021
  
  b7bebd44 Browse Files
17 Sep, 2021 24 commits
- Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'qa' of… · d2eac458
```
Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 17, 2021
  d2eac458 Browse Files
- 优惠类型转换 · d271d647
  ping.wu committed Sep 17, 2021
  
  d271d647 Browse Files
- Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa · 322da8b8
  徐康 committed Sep 17, 2021
  
  322da8b8 Browse Files
- 网关验证 · 4d349f1e
  徐康 committed Sep 17, 2021
  
  4d349f1e Browse Files
- 网关验证 · b6bb4bcb
  徐康 committed Sep 17, 2021
  
  b6bb4bcb Browse Files
- 网关验证 · 922a9641
  徐康 committed Sep 17, 2021
  
  922a9641 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 6d158d61
  徐康 committed Sep 17, 2021
  
  6d158d61 Browse Files
- Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa · 57ffbb8c
  徐康 committed Sep 17, 2021
  
  57ffbb8c Browse Files
- 网关验证 · ccfec5b3
  徐康 committed Sep 17, 2021
  
  ccfec5b3 Browse Files
- 电子发票开票2 · 2870fd07
  陈斌 committed Sep 17, 2021
  
  2870fd07 Browse Files
- 电子发票开票 · 5eb17a1c
  陈斌 committed Sep 17, 2021
  
  5eb17a1c Browse Files
- 预约单 · 18367876
  徐康 committed Sep 17, 2021
  
  18367876 Browse Files
- Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa · e3b92b6f
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
```
  徐康 committed Sep 17, 2021
  e3b92b6f Browse Files
- 预约单 · cab83486
  徐康 committed Sep 17, 2021
  
  cab83486 Browse Files
- Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa · 78c555a0
  徐康 committed Sep 17, 2021
  
  78c555a0 Browse Files
- 预约单 · 2c5f4ba4
  徐康 committed Sep 17, 2021
  
  2c5f4ba4 Browse Files
- Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa · 15a96d0c
  徐康 committed Sep 17, 2021
  
  15a96d0c Browse Files
- 预约单 · 7cb99027
  徐康 committed Sep 17, 2021
  
  7cb99027 Browse Files
- Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa · d0ed2609
  徐康 committed Sep 17, 2021
  
  d0ed2609 Browse Files
- 预约单 · 5e6dae4b
  徐康 committed Sep 17, 2021
  
  5e6dae4b Browse Files
- 价格修复 · dd2121ff
  徐康 committed Sep 17, 2021
  
  dd2121ff Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 34b9b49a
  徐康 committed Sep 17, 2021
  
  34b9b49a Browse Files
- 价格修复 · a1eb7345
  徐康 committed Sep 17, 2021
  
  a1eb7345 Browse Files
- Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'qa' of… · cc3079ce
```
Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 17, 2021
  cc3079ce Browse Files