 lixuesong
|
d1d52e1ac1
Merge branch 'master' into feature-settleexport-210712
|
4 жил өмнө |
|
lixuesong
|
23365f918c
feat(controller): 积分包结算导出，结算包结算导出
|
4 жил өмнө |
|
lixuesong
|
b1cc9ed251
feat(controller): 结算包结算-导出
|
4 жил өмнө |
|
lixuesong
|
181e2cfc6b
feat(controller): 结算包结算-导出
|
4 жил өмнө |
|
lixuesong
|
0fa1ec55e5
feat(controller): 积分包结算管理-导出
|
4 жил өмнө |
 屈桐
|
464183469a
Merge branch 'hotfix-mpshare-20210706' of googol/YY_BE_2 into master
|
4 жил өмнө |
|
屈桐
|
912a373df2
Merge branch 'hotfix-taxhelpernotify-20210712' of googol/YY_BE_2 into master
|
4 жил өмнө |
 shc
|
ca20f8ec69
fix(controller): 复原税邦云支付回调老版本
|
4 жил өмнө |
|
屈桐
|
05fc73ffb6
Merge branch 'tmp' of googol/YY_BE_2 into master
|
4 жил өмнө |
|
屈桐
|
3a7c31973c
Merge branch 'feature-cso1tocso2-210706' of googol/YY_BE_2 into tmp
|
4 жил өмнө |
|
屈桐
|
3682a4d922
Merge branch 'feature-cso1tocso2-210706' of googol/YY_BE_2 into develop
|
4 жил өмнө |
|
lixuesong
|
a0e539261e
fix(service): 修复结算报告审批-查看/审批页面姓名回显编号问题
|
4 жил өмнө |
|
屈桐
|
8b7beef5d7
Merge branch 'feature-cso1tocso2-210706' of googol/YY_BE_2 into develop
|
4 жил өмнө |
|
lixuesong
|
85b2ddd68a
fix(service): 修复结算报告审批-查看/审批页面姓名回显编号问题
|
4 жил өмнө |
|
lixuesong
|
c52c6b16fe
fix(service): 修复医生端-系统对接界面-导出报告功能报错
|
4 жил өмнө |
|
屈桐
|
a772d2bea4
Merge branch 'feature-cso1tocso2-210706' of googol/YY_BE_2 into develop
|
4 жил өмнө |
 Qutong
|
48e10a3946
feat(pom):修改启动环境变量
|
4 жил өмнө |
|
Qutong
|
0f546d6940
feat(pom):修改启动环境变量
|
4 жил өмнө |
|
屈桐
|
a8553b11a1
Merge branch 'feature-cso1tocso2-210706' of googol/YY_BE_2 into develop
|
4 жил өмнө |
|
lixuesong
|
5a08da2366
fix(controller): 1.修复已结算没有值问题；2.修复二级cso积分规则回显；3.过滤关联积分包为0的。
|
4 жил өмнө |
|
屈桐
|
63764697d5
Merge branch 'master' of googol/YY_BE_2 into develop
|
4 жил өмнө |
|
屈桐
|
f9c37f4637
Merge branch 'feature-cso1tocso2-210706' of googol/YY_BE_2 into develop
|
4 жил өмнө |
|
lixuesong
|
f6d42f9d15
fix(controller): 修复新增二级CSO时没有自己的积分规则
|
4 жил өмнө |
|
shc
|
9523fbca5b
fix(controller): 修复文章分享阅读和相册分享阅读积分包值占比判断逻辑，由占积分包积分改为占个人领包积分
|
4 жил өмнө |
|
屈桐
|
a9454c1fcd
Merge branch 'hotfix-mpshare-20210706' of googol/YY_BE_2 into master
|
4 жил өмнө |
|
shc
|
bd27b66ee2
fix(controller): 修复文章分享和相册超过次数限制后打开后的积分获取规则
|
4 жил өмнө |
|
lixuesong
|
b5b896ceea
fix(service): 1.任务中心中，限制二级CSO生成报告；2.二级CSO任务中心界面，后发的包在上面。
|
4 жил өмнө |
|
shc
|
afeeb67ef7
fix(controller): 修复每人每天每篇文章转发上线5->20
|
4 жил өмнө |
|
屈桐
|
1d074e2fd3
Merge branch 'hotfix-mpshare-20210706' of googol/YY_BE_2 into develop
|
4 жил өмнө |
|
屈桐
|
f858048480
Merge branch 'hotfix-mpshare-20210706' of googol/YY_BE_2 into master
|
4 жил өмнө |
