Commits · d5feb89da5c15d2a66b142a961c757851321d0b9 · youjj / cloud-platform

10 Jan, 2020 6 commits
- Merge branch 'master-invoice-modular' into dev · d5feb89d
  jiaorz authored Jan 10, 2020
  
  d5feb89d
- 发票 · 2244947a
  jiaorz authored Jan 10, 2020
  
  2244947a
- Merge branch 'master-invoice-modular' into dev · 5c68b6f4
  jiaorz authored Jan 10, 2020
  
  5c68b6f4
- 发票 · 56409d2d
  jiaorz authored Jan 10, 2020
  
  56409d2d
- Merge branch 'master-invoice-modular' into dev · bea92ed4
  jiaorz authored Jan 10, 2020
```
# Conflicts:
#	xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
```
  bea92ed4
- 发票 · 7916047e
  jiaorz authored Jan 10, 2020
  
  7916047e
09 Jan, 2020 34 commits
- Merge branch 'master-invoice-modular' into dev · 8b2435ff
  jiaorz authored Jan 09, 2020
  
  8b2435ff
- 发票 · 02d4f8c3
  jiaorz authored Jan 09, 2020
  
  02d4f8c3
- Merge branch 'master-invoice-modular' into dev · 2d063564
  jiaorz authored Jan 09, 2020
  
  2d063564
- 发票 · 79b9b533
  jiaorz authored Jan 09, 2020
  
  79b9b533
- Merge branch 'master-invoice-modular' into dev · 8bd37b9a
  jiaorz authored Jan 09, 2020
  
  8bd37b9a
- 发票 · 4a2242ad
  jiaorz authored Jan 09, 2020
  
  4a2242ad
- Merge branch 'master-invoice-modular' into dev · 74e422bd
  jiaorz authored Jan 09, 2020
  
  74e422bd
- 发票 · 40be8da8
  jiaorz authored Jan 09, 2020
  
  40be8da8
- Merge branch 'master-invoice-modular' into dev · 292e5120
  jiaorz authored Jan 09, 2020
  
  292e5120
- 发票 · 6d72472b
  jiaorz authored Jan 09, 2020
  
  6d72472b
- Merge branch 'master-invoice-modular' into dev · 861b1bf3
  jiaorz authored Jan 09, 2020
  
  861b1bf3
- 发票 · 76d14f55
  jiaorz authored Jan 09, 2020
  
  76d14f55
- Merge branch 'master-invoice-modular' into dev · 1d5d6540
  jiaorz authored Jan 09, 2020
  
  1d5d6540
- 发票 · 236d2c92
  jiaorz authored Jan 09, 2020
  
  236d2c92
- Merge branch 'master-invoice-modular' into dev · b0db90cc
  jiaorz authored Jan 09, 2020
  
  b0db90cc
- 发票 · 01a45e82
  jiaorz authored Jan 09, 2020
  
  01a45e82
- Merge branch 'master-invoice-modular' into dev · 6144df2b
  jiaorz authored Jan 09, 2020
  
  6144df2b
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · dafa616c
  jiaorz authored Jan 09, 2020
  
  dafa616c
- 发票 · 915455bd
  jiaorz authored Jan 09, 2020
  
  915455bd
- Merge branch 'master-invoice-modular' into dev · 727396cc
  hanfeng authored Jan 09, 2020
  
  727396cc
- 开票 · 9b01f42f
  hanfeng authored Jan 09, 2020
  
  9b01f42f
- Merge branch 'master-invoice-modular' into dev · 5952a493
  hanfeng authored Jan 09, 2020
  
  5952a493
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · a34221b7
  jiaorz authored Jan 09, 2020
  
  a34221b7
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · a0e1bb3f
  hanfeng authored Jan 09, 2020
  
  a0e1bb3f
- 开票 · 3f9e700c
  hanfeng authored Jan 09, 2020
  
  3f9e700c
- 开票 · 78557bcc
  hanfeng authored Jan 09, 2020
  
  78557bcc
- 发票 · 22947e4c
  jiaorz authored Jan 09, 2020
  
  22947e4c
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · ed6ac5f8
  jiaorz authored Jan 09, 2020
  
  ed6ac5f8
- 发票 · 9f47b0f3
  jiaorz authored Jan 09, 2020
  
  9f47b0f3
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · a87aab13
  jiaorz authored Jan 09, 2020
```
# Conflicts:
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/InvoiceController.java
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/InvoiceBiz.java
```
  a87aab13
- 开票 · 019e2e45
  hanfeng authored Jan 09, 2020
  
  019e2e45
- 发票 · f9247a00
  jiaorz authored Jan 09, 2020
  
  f9247a00
- 发票 · a6d7ac2e
  jiaorz authored Jan 09, 2020
  
  a6d7ac2e
- Merge branch 'master-invoice-modular' into dev · 7c885bcd
  hanfeng authored Jan 09, 2020
  
  7c885bcd