czj001 pushed to dev at fjhx2012/bytesailing
43798bbdd5 业绩提成头部统计搜索BUG修复
- d55e754fea Merge remote-tracking branch 'origin/dev' into dev
- 2f4417fa03 Merge branch 'master' into dev
# Conflicts:
# hx-account/src/main/java/com/fjhx/account/entity/transaction/vo/TransactionVo.java
# hx-account/src/main/java/com/fjhx/account/mapper/transaction/TransactionMapper.java
# hx-account/src/main/java/com/fjhx/account/service/transaction/TransactionService.java
# hx-account/src/main/java/com/fjhx/account/service/transaction/impl/TransactionServiceImpl.java
# hx-account/src/main/resources/mapper/transaction/TransactionMapper.xml
- 8260123be9 业绩提成头部统计搜索
- 584dc56e67 业绩提成头部统计搜索
- View comparison for these 8 commits »
1 år sedan
czj001 pushed to master at fjhx2012/bytesailing
- e007e5f3de Merge remote-tracking branch 'origin/master'
- c938ff4df3 往来管理头部统计
- View comparison for these 2 commits »
1 år sedan
czj001 pushed to master at czj001/ehsd
- c793f2457c Merge remote-tracking branch 'origin/master'
- 0645774b50 外销合同头部统计
- View comparison for these 2 commits »
1 år sedan
czj001 pushed to master at czj001/ehsd
- 84c537036c Merge remote-tracking branch 'origin/master'
- d6f60e91bb 利润预算表BUG修复
- View comparison for these 2 commits »
1 år sedan
czj001 pushed to master at czj001/ehsd
- decda82c90 Merge remote-tracking branch 'origin/master'
- 1e16f936fe 样品单变更增加流程ID赋值
- View comparison for these 2 commits »
1 år sedan
czj001 pushed to dev at fjhx2012/bytesailing
- bb914677d9 销售发票增加归属公司过滤
- 63774e3ec6 Merge remote-tracking branch 'origin/dev' into dev
- de86d21a16 Merge branch 'test' into dev
- a5e15810e5 Merge remote-tracking branch 'origin/master'
- 5520a43ac3 合同变更BUG修复
- View comparison for these 5 commits »
1 år sedan
czj001 pushed to master at fjhx2012/bytesailing
- a5e15810e5 Merge remote-tracking branch 'origin/master'
- 5520a43ac3 合同变更BUG修复
- View comparison for these 2 commits »
1 år sedan
czj001 pushed to dev at fjhx2012/bytesailing
- 4f20334797 Merge remote-tracking branch 'origin/dev' into dev
- 2c47d6a9ff 合同变更审批、利润结算表BUG修复
- View comparison for these 2 commits »
1 år sedan
czj001 pushed to dev at fjhx2012/bytesailing
- b58a46e95a Merge remote-tracking branch 'origin/dev' into dev
- 701b43b7fa 业绩提成头部统计
- 71ce34098a Merge remote-tracking branch 'origin/dev' into dev
- 5e97694831 Merge remote-tracking branch 'origin/dev' into dev
- 45afcc68a4 Merge branch 'master' into dev
- View comparison for these 5 commits »
1 år sedan
czj001 pushed to master at fjhx2012/bytesailing
- 1d07e496d6 Merge remote-tracking branch 'origin/master'
- f8dad5f451 利润结算表头部保留两位小数
- View comparison for these 2 commits »
1 år sedan