Commits · 158fbd29943f16ce1ab0dfb37c128ce3700ae272 · youjj / cloud-platform

09 Jan, 2020 23 commits
- Merge branch 'master-invoice-modular' into dev · 158fbd29
  jiaorz authored Jan 09, 2020
  
  158fbd29
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · b804ee4a
  jiaorz authored Jan 09, 2020
  
  b804ee4a
- 发票 · b4e12422
  jiaorz authored Jan 09, 2020
  
  b4e12422
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · 3d99ed2f
  hanfeng authored Jan 09, 2020
  
  3d99ed2f
- 开票 · 6b74c969
  hanfeng authored Jan 09, 2020
  
  6b74c969
- 开票 · deaec583
  hanfeng authored Jan 09, 2020
  
  deaec583
- Merge branch 'master-invoice-modular' into dev · edbbdd7c
  jiaorz authored Jan 09, 2020
  
  edbbdd7c
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · fdbcafbc
  jiaorz authored Jan 09, 2020
  
  fdbcafbc
- 发票 · 35f22cea
  jiaorz authored Jan 09, 2020
  
  35f22cea
- Merge branch 'master-invoice-modular' into dev · c0cd9331
  hanfeng authored Jan 09, 2020
  
  c0cd9331
- 开票 · 497c724e
  hanfeng authored Jan 09, 2020
  
  497c724e
- Merge branch 'master-invoice-modular' into dev · b60d8b75
  hanfeng authored Jan 09, 2020
  
  b60d8b75
- 开票 · 0809bbb9
  hanfeng authored Jan 09, 2020
  
  0809bbb9
- Merge branch 'master-invoice-modular' into dev · bc7d2ab3
  hanfeng authored Jan 09, 2020
  
  bc7d2ab3
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · 7c0d75bb
  hanfeng authored Jan 09, 2020
  
  7c0d75bb
- 开票 · 0b072e50
  hanfeng authored Jan 09, 2020
  
  0b072e50
- Merge remote-tracking branch 'origin/dev' into dev · 6649892a
  hanfeng authored Jan 09, 2020
  
  6649892a
- Merge branch 'master-invoice-modular' into dev · ed63add5
  hanfeng authored Jan 09, 2020
  
  ed63add5
- 开票 · c8d23462
  hanfeng authored Jan 09, 2020
  
  c8d23462
- Merge branch 'master-invoice-modular' into dev · a74d70a2
  jiaorz authored Jan 09, 2020
  
  a74d70a2
- 发票 · 7b1382c7
  jiaorz authored Jan 09, 2020
  
  7b1382c7
- Merge remote-tracking branch 'origin/dev' into dev · 050ee151
  hanfeng authored Jan 09, 2020
  
  050ee151
- Merge branch 'master-invoice-modular' into dev · 665bae30
  hanfeng authored Jan 09, 2020
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
```
  665bae30
08 Jan, 2020 17 commits
- Merge branch 'master-invoice-modular' into dev · 53e2acfd
  jiaorz authored Jan 08, 2020
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
```
  53e2acfd
- 发票 · 830dfa2d
  jiaorz authored Jan 08, 2020
  
  830dfa2d
- 发票 · 10405431
  jiaorz authored Jan 08, 2020
  
  10405431
- Merge branch 'master-invoice-modular' into dev · 2b479b0d
  jiaorz authored Jan 08, 2020
  
  2b479b0d
- 发票 · fbffe8b8
  jiaorz authored Jan 08, 2020
  
  fbffe8b8
- 发票 · e641fb57
  jiaorz authored Jan 08, 2020
  
  e641fb57
- Merge branch 'master-invoice-modular' into dev · 816c5d92
  jiaorz authored Jan 08, 2020
  
  816c5d92
- 发票 · c192d1c0
  jiaorz authored Jan 08, 2020
  
  c192d1c0
- Merge branch 'master-invoice-modular' into dev · a45d589c
  jiaorz authored Jan 08, 2020
  
  a45d589c
- 发票 · 89ef4069
  jiaorz authored Jan 08, 2020
  
  89ef4069
- Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular · 754b5937
  hanfeng authored Jan 08, 2020
  
  754b5937
- 开票 · e95bc352
  hanfeng authored Jan 08, 2020
  
  e95bc352
- 开票 · c8f1af62
  hanfeng authored Jan 08, 2020
  
  c8f1af62
- Merge remote-tracking branch 'origin/dev' into dev · b9093bb4
  jiaorz authored Jan 08, 2020
  
  b9093bb4
- Merge branch 'master-order' into dev · 8a1c7486
  jiaorz authored Jan 08, 2020
  
  8a1c7486
- 会员订单禁用 · 9a1a0f0d
  jiaorz authored Jan 08, 2020
  
  9a1a0f0d
- 会员订单禁用 · 1abac7c9
  jiaorz authored Jan 08, 2020
  
  1abac7c9