郑永星
|
bdd626d187
|
Merge pull request '工会信息bug修改' (#90) from feature/add_item_two into release
工会信息bug修改
|
4 years ago |
zhengyongxing
|
6243ca60cf
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two
Conflicts:
Application/Admin/Controller/SocietyInfoController.class.php
Public/static/area.js
|
4 years ago |
zhengyongxing
|
a199a12d4b
|
工会信息bug修改
|
4 years ago |
zhengyongxing
|
64a565d908
|
1.28功能提交
|
4 years ago |
zhengyongxing
|
0fe7e58c61
|
市场业绩离职功能提交导出修正
|
4 years ago |
zhengyongxing
|
c9ef39ada9
|
市场业绩离职功能提交导出修正
|
4 years ago |
zhengyongxing
|
d3e9f113ba
|
市场业绩离职功能提交导出修正
|
4 years ago |
廖金灵
|
c7a22ce7dd
|
Merge pull request '特殊补点导出修正' (#89) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/89
|
4 years ago |
郑永星
|
6c6f458d8b
|
Merge pull request '特殊补点导出修正' (#88) from feature/add_item_two into release
特殊补点导出修正
|
4 years ago |
zhengyongxing
|
7054f82fde
|
特殊补点导出修正
|
4 years ago |
zhengyongxing
|
6e767a739c
|
市场业绩功能提交
|
4 years ago |
郑永星
|
5ce0be3fe2
|
Merge pull request '公会信息登记信息补充' (#87) from feature/add_item into release
公会信息登记信息补充
|
4 years ago |
zhengyongxing
|
3beeb81063
|
公会信息登记信息补充
|
4 years ago |
郑永星
|
fa3943cda4
|
Merge pull request '公会信息登记信息补充' (#86) from feature/add_item into release
公会信息登记信息补充
|
4 years ago |
zhengyongxing
|
e0430cfb46
|
公会信息登记信息补充
|
4 years ago |
郑永星
|
f4ff2c9666
|
Merge pull request '公会信息登记信息补充' (#85) from feature/add_item into release
公会信息登记信息补充
|
4 years ago |
zhengyongxing
|
f923f4d667
|
公会信息登记信息补充
|
4 years ago |
廖金灵
|
e2c69406ad
|
Merge pull request 'feature/more_finance_20201211' (#84) from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/84
|
4 years ago |
陈志
|
55e29b571c
|
Merge pull request 'feature/more_finance_20201211' (#83) from feature/more_finance_20201211 into release
优化公式
|
4 years ago |
chenzhi
|
174219d9d5
|
优化公式
|
4 years ago |
chenzhi
|
197e129f04
|
优化结算比例公式
|
4 years ago |
郑永星
|
9ed794a56c
|
Merge pull request 'feature/add_item' (#82) from feature/add_item into release
公会信息录入功能添加
|
4 years ago |
zhengyongxing
|
e775701c78
|
公会信息登记导出补充
|
4 years ago |
zhengyongxing
|
9fceedd10e
|
模板下载功能添加
|
4 years ago |
zhengyongxing
|
07ee17ca1d
|
公会信息录入功能添加
|
4 years ago |
廖金灵
|
fa0675ae99
|
Merge pull request '数据汇总下载超时' (#81) from hotfix/doload_timeout into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/81
|
4 years ago |
廖金灵
|
db5d4cf7ef
|
Merge pull request '修改下载超时' (#80) from hotfix/doload_timeout into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/80
|
4 years ago |
ELF
|
3dfc92ecc3
|
修改下载超时
|
4 years ago |
廖金灵
|
468a5ab162
|
Merge pull request '优化重算' (#79) from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/79
|
4 years ago |
chenzhi
|
170895055e
|
优化重算
|
4 years ago |
廖金灵
|
84e1b5c0f3
|
Merge pull request '市场业绩上月业绩绩效百分比比对' (#78) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/78
|
4 years ago |
郑永星
|
c14c4d291c
|
Merge pull request '市场业绩上月业绩绩效百分比比对' (#77) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/77
|
4 years ago |
zhengyongxing
|
667c43dc5c
|
市场业绩上月业绩绩效百分比比对
|
4 years ago |
廖金灵
|
36416208f2
|
Merge pull request '特殊补点编辑修改' (#75) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/75
|
4 years ago |
郑永星
|
4d6cc118f2
|
Merge pull request '特殊补点编辑修改' (#76) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/76
|
4 years ago |
zhengyongxing
|
b073f3e8cd
|
特殊补点编辑修改
|
4 years ago |
郑永星
|
ba8e852152
|
Merge pull request 'feature/add_item' (#74) from feature/add_item into release
特殊补点编辑修改
|
4 years ago |
zhengyongxing
|
fecb58efdd
|
特殊补点编辑修改
|
4 years ago |
廖金灵
|
2e21b124b7
|
Merge pull request 'feature/more_finance_20201211' (#73) from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/73
|
4 years ago |
陈志
|
476a66f77c
|
Merge pull request 'feature/more_finance_20201211' (#72) from feature/more_finance_20201211 into release
优化结算人
|
4 years ago |
chenzhi
|
6dd2558350
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
chenzhi
|
3a629d63ea
|
优化结算人
|
4 years ago |
廖金灵
|
34d778f4ce
|
Merge pull request 'hotfix/company_bug' (#71) from hotfix/company_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/71
|
4 years ago |
廖金灵
|
7e5b3cfe7f
|
Merge pull request 'hotfix/company_bug' (#70) from hotfix/company_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/70
|
4 years ago |
tping
|
09076be22b
|
Merge branch 'release' into hotfix/company_bug
|
4 years ago |
tping
|
32d3160320
|
Merge branch 'feature/add_item' into hotfix/company_bug
|
4 years ago |
zhengyongxing
|
a641ff2526
|
上游公司分页修改
|
4 years ago |
tping
|
90045b140d
|
Merge branch 'hotfix/company_bug' into release
|
4 years ago |
tping
|
8897a87342
|
甲乙方公司
|
4 years ago |
廖金灵
|
5c119e2d76
|
Merge pull request '优化登陆' (#68) from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/68
|
4 years ago |