Commits · 7d5aa7d65a9a04d7274fd5924bb7d32a1b36789f · hlcm / leaf-hlcm

14 Oct, 2019 3 commits
- Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop · 7d5aa7d6
  homunculus authored Oct 14, 2019
  
  7d5aa7d6
- Merge branch 'feature/payment_feature' into develop · a913c671
  stone authored Oct 14, 2019
  
  a913c671
- [fix] 完成付款申请开发 · 6ec786c2
  stone authored Oct 14, 2019
  
  6ec786c2
12 Oct, 2019 5 commits
- Merge branch 'feature/payment_feature' into develop · 05d9f8f2
  stone authored Oct 12, 2019
  
  05d9f8f2
- [fix]修改付款查询页面，修改付款申请页面 · 6ceb9f8e
  stone authored Oct 12, 2019
  
  6ceb9f8e
- Merge branch 'feature/con_change_feature_v5' into develop · e0469d5c
  Spencer Chang authored Oct 12, 2019
  
  e0469d5c
- [fix] bug修改 · bf4fb266
  Spencer Chang authored Oct 12, 2019
  
  bf4fb266
- [feat]完成发票认领申请、确认的开发 · 538277e2
  homunculus authored Oct 12, 2019
  
  538277e2
10 Oct, 2019 2 commits
- Merge branch 'feature/acr_invoice_v4' into develop · aae534c5
  homunculus authored Oct 10, 2019
  
  aae534c5
- [feat]增加发票认领申请和发票认领确认两个页面 · 00bbfc60
  homunculus authored Oct 10, 2019
  
  00bbfc60
09 Oct, 2019 2 commits
- Merge branch 'feature/return_money_feature' into develop · fb0dd2f1
  stone authored Oct 09, 2019
  
  fb0dd2f1
- [fix] 修改收款bug · 2b72e25b
  stone authored Oct 09, 2019
  
  2b72e25b
08 Oct, 2019 8 commits
- Merge branch 'contract' into develop · b86e9bb1
  lijingjing authored Oct 08, 2019
  
  b86e9bb1
- [fix]报价客户评分超链接跳转优化 · 9ade95bb
  lijingjing authored Oct 08, 2019
  
  9ade95bb
- Merge branch 'contract' into develop · 79ddd874
  lijingjing authored Oct 08, 2019
  
  79ddd874
- [feat]合同文本生成优化 · 8285c6ee
  lijingjing authored Oct 08, 2019
  
  8285c6ee
- Merge branch 'contract' into develop · 27e47b24
  lijingjing authored Oct 08, 2019
  
  27e47b24
- [feat]合同文本生成 · 79559852
  lijingjing authored Oct 08, 2019
  
  79559852
- Merge branch 'feature/acr_invoice_v3' into develop · f1cba496
  homunculus authored Oct 08, 2019
  
  f1cba496
- [fix]修改进项发票的一些细节 · d8ae1b88
  homunculus authored Oct 08, 2019
  
  d8ae1b88
30 Sep, 2019 12 commits
- [fix] 回款账户校验不能重复 · 40ab5495
  Spencer Chang authored Sep 30, 2019
  
  40ab5495
- [fix] 错别字修改；ds调用修改 · 61fe0279
  Spencer Chang authored Sep 30, 2019
  
  61fe0279
- Merge branch 'feature/return_money_feature' into develop · 91912484
  stone authored Sep 30, 2019
  
  91912484
- [feat] 商业伙伴授信创建 · fa535218
  stone authored Sep 30, 2019
  
  fa535218
- [fix] 用印信息增加一式四份类别 · 44a055c0
  Spencer Chang authored Sep 30, 2019
  
  44a055c0
- Merge branch 'contract' into develop · 6249d928
  lijingjing authored Sep 30, 2019
  
  6249d928
- [feat]租赁物保存前校验 · bfebc603
  lijingjing authored Sep 30, 2019
  
  bfebc603
- Merge branch 'feature/con_change_feature_v4' into develop · dfc95b9b
  Spencer Chang authored Sep 30, 2019
  
  dfc95b9b
- [fix] 增加grid查询事件，重设用印信息查询条件 · 31ae1224
  Spencer Chang authored Sep 30, 2019
  
  31ae1224
- [feat]增加商业伙伴管理简称校验 · d5c2105f
  homunculus authored Sep 30, 2019
  
  d5c2105f
- [fix] 变更默认添加用印信息 · 71a21eea
  Spencer Chang authored Sep 30, 2019
  
  71a21eea
- [fix] 修改明细页面显示title · 4c8b6faa
  Spencer Chang authored Sep 30, 2019
  
  4c8b6faa
29 Sep, 2019 8 commits
- [fix] 生成文本按钮明细页面取消 · 3b1b7caf
  Spencer Chang authored Sep 29, 2019
  
  3b1b7caf
- [fix] · 81d6175a
  stone authored Sep 29, 2019
```
修改描述
```
  81d6175a
- [fix] 增加用印信息维护过程 · c76abba5
  Spencer Chang authored Sep 29, 2019
  
  c76abba5
- [feat] 发票确认 · 0dfa9f42
  homunculus authored Sep 29, 2019
  
  0dfa9f42
- Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop · d0912507
  homunculus authored Sep 29, 2019
```
# Conflicts:
#	src/main/database/Init/Sys_message/INITIALIZE_CREATED_BY_ERROR_MESSAGE.sql
```
  d0912507
- [feat]新增进项发票导入和进项发票导入确认 · 95c124d6
  homunculus authored Sep 29, 2019
  
  95c124d6
- Merge branch 'feature/acr_invoice' into develop · 0bfc078f
  homunculus authored Sep 29, 2019
  
  0bfc078f
- [feat]新增进项发票导入和进项发票导入确认 · 0ce05ad0
  homunculus authored Sep 29, 2019
  
  0ce05ad0