zhengyongxing
|
199b5e0f51
|
1.28功能提交
|
4 years ago |
郑永星
|
5c5fc23210
|
Merge pull request '1.28功能提交' (#130) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/130
|
4 years ago |
zhengyongxing
|
cd1f84fb37
|
1.28功能提交
|
4 years ago |
廖金灵
|
9af9edef0a
|
Merge pull request '优化' (#129) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/129
|
4 years ago |
ELF
|
a3d3b5722c
|
优化
|
4 years ago |
郑永星
|
a5ed9cf3cf
|
Merge pull request '1.28功能提交' (#128) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/128
|
4 years ago |
zhengyongxing
|
a1c809d7eb
|
1.28功能提交
|
4 years ago |
郑永星
|
3d09dcf4b5
|
Merge pull request '1.28功能提交' (#127) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/127
|
4 years ago |
zhengyongxing
|
338c0369d1
|
1.28功能提交
|
4 years ago |
郑永星
|
8d9ca939d6
|
Merge pull request '1.28功能提交' (#126) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/126
|
4 years ago |
zhengyongxing
|
25ec474c1c
|
1.28功能提交
|
4 years ago |
郑永星
|
e9be27136f
|
Merge pull request '1.28功能提交' (#121) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/121
|
4 years ago |
zhengyongxing
|
77f7eda10f
|
1.28功能提交
|
4 years ago |
廖金灵
|
dcbc152712
|
Merge pull request '优化' (#125) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/125
|
4 years ago |
ELF
|
4f3c21263d
|
优化
|
4 years ago |
陈志
|
dcb2e68346
|
Merge pull request '优化提示' (#124) from feature/finance_payment_20210115 into release
优化提示
|
4 years ago |
chenzhi
|
3947f12f54
|
优化提示
|
4 years ago |
陈志
|
b9f83d7f15
|
Merge pull request '优化打款信息' (#123) from feature/finance_payment_20210115 into release
优化打款信息
|
4 years ago |
chenzhi
|
9a0ba40d6d
|
优化打款信息
|
4 years ago |
tping
|
6ed8fee113
|
1
|
4 years ago |
tping
|
de31285f85
|
Merge branch 'release' into feature/0128
|
4 years ago |
tping
|
a865b9d669
|
文字修改
|
4 years ago |
zhengyongxing
|
88fc0e2926
|
1.28功能提交
|
4 years ago |
郑永星
|
e1a05cb9fe
|
Merge pull request '1.28功能提交' (#120) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/120
|
4 years ago |
zhengyongxing
|
45ed2e7f16
|
1.28功能提交
|
4 years ago |
郑永星
|
272eca3f9a
|
Merge pull request '1.28功能提交' (#119) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/119
|
4 years ago |
zhengyongxing
|
7a2e4d9033
|
1.28功能提交
|
4 years ago |
郑永星
|
e4fb38e5f7
|
Merge pull request '1.28功能提交' (#118) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/118
|
4 years ago |
zhengyongxing
|
3c1a7a2e61
|
1.28功能提交
|
4 years ago |
郑永星
|
154c0989c8
|
Merge pull request '1.28功能提交' (#117) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/117
|
4 years ago |
zhengyongxing
|
7e4f8ca78d
|
1.28功能提交
|
4 years ago |
郑永星
|
5a232e6bb6
|
Merge pull request '1.28功能提交' (#116) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/116
|
4 years ago |
zhengyongxing
|
3c566fb2ae
|
1.28功能提交
|
4 years ago |
tping
|
c59b8d1419
|
导出所有
|
4 years ago |
tping
|
cfd4368fe5
|
1
|
4 years ago |
tping
|
5c22a252a3
|
Merge branch 'release' into feature/0128
|
4 years ago |
tping
|
a5b977aa00
|
导出所有
|
4 years ago |
廖金灵
|
7194d5a945
|
Merge pull request '优化' (#112) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/112
|
4 years ago |
ELF
|
0aa3c514d7
|
优化
|
4 years ago |
陈志
|
14ba644fda
|
Merge pull request '优化提醒名词' (#111) from feature/testing_daily_count into release
Re优化提醒名词
|
4 years ago |
chenzhi
|
9d9ef7a79b
|
优化提醒名词
|
4 years ago |
陈志
|
98f9c61104
|
Merge pull request '优化排序' (#110) from feature/testing_daily_count into release
优化排序
|
4 years ago |
chenzhi
|
746388dd00
|
优化排序
|
4 years ago |
陈志
|
b690ef68a2
|
Merge pull request 'feature/testing_daily_count' (#109) from feature/testing_daily_count into release
优化菜单适配
|
4 years ago |
chenzhi
|
3f88e7dc6f
|
优化菜单适配
|
4 years ago |
chenzhi
|
b19853edd3
|
优化菜单
|
4 years ago |
zhengyongxing
|
8a49578cc4
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item
|
4 years ago |
zhengyongxing
|
104051d90f
|
1.28功能提交
|
4 years ago |
陈志
|
0b55550a62
|
Merge pull request 'feature/testing_daily_count' (#107) from feature/testing_daily_count into release
优化首页提醒
|
4 years ago |
chenzhi
|
13d0c6fa59
|
优化首页提醒
|
4 years ago |
zhengyongxing
|
c7730d5d06
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/add_item
|
4 years ago |
ELF
|
9e68e40200
|
解决冲突
|
4 years ago |
chenzhi
|
2658c50c3a
|
新增测试资源统计
|
4 years ago |
ELF
|
531b94bae8
|
版本
|
4 years ago |
郑永星
|
f4bb1cc5e2
|
Merge pull request '1.28功能提交' (#105) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/105
|
4 years ago |
zhengyongxing
|
f710113820
|
1.28功能提交
|
4 years ago |
郑永星
|
fec6edf48c
|
Merge pull request '1.28功能提交' (#104) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/104
|
4 years ago |
zhengyongxing
|
14be887ebb
|
1.28功能提交
|
4 years ago |
郑永星
|
747082fc0d
|
1.28功能提交
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/103
|
4 years ago |
zhengyongxing
|
ee463829d2
|
1.28功能提交
|
4 years ago |
chenzhi
|
2e2ff8e1d7
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
chenzhi
|
027c803343
|
优化打款备注
|
4 years ago |
郑永星
|
31d831e39a
|
Merge pull request '1.28功能提交' (#101) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/101
|
4 years ago |
zhengyongxing
|
0080dc75d7
|
1.28功能提交
|
4 years ago |
chenzhi
|
a845ff4d84
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
elf@home
|
34e25f293a
|
推广员添加每级id
|
4 years ago |
郑永星
|
6c1c82b649
|
Merge pull request '1.28功能提交' (#100) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/100
|
4 years ago |
zhengyongxing
|
58e8efbd7f
|
1.28功能提交
|
4 years ago |
zhengyongxing
|
deff984922
|
1.28功能提交
|
4 years ago |
廖金灵
|
e31fec8a5c
|
Merge pull request '修改' (#98) from feature/jpck into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/98
|
4 years ago |
ELF
|
d08df7feba
|
修改
|
4 years ago |
陈志
|
3df6e7246a
|
Merge pull request 'feature/finance_payment_20210115' (#97) from feature/finance_payment_20210115 into release
新增线上转线下打款
|
4 years ago |
chenzhi
|
684ea81b6a
|
新增线上转线下打款
|
4 years ago |
廖金灵
|
293f2941be
|
Merge pull request '剑破长空测试资源接口' (#96) from feature/jpck into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/96
|
4 years ago |
ELF
|
07c95d2ea7
|
剑破长空测试资源
|
4 years ago |
chenzhi
|
7617ee8a4c
|
优化支付导出
|
4 years ago |
chenzhi
|
28eedef4ed
|
优化支付宝信息更新
|
4 years ago |
chenzhi
|
1427e7e744
|
新增更新支付信息功能ok
|
4 years ago |
郑永星
|
af3a48f0d8
|
Merge pull request '奖惩限制逻辑修改' (#94) from hotfix/reward_limit into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/94
|
4 years ago |
zhengyongxing
|
508f4abef1
|
奖惩限制逻辑修改
|
4 years ago |
zhengyongxing
|
963e806218
|
奖惩限制逻辑修改
|
4 years ago |
zhengyongxing
|
14a0e564e1
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/rewardlimit
|
4 years ago |
zhengyongxing
|
2366a215a2
|
奖惩先去除限制逻辑
|
4 years ago |
zhengyongxing
|
b7c671ef1c
|
结算单汇总功能提交
|
4 years ago |
chenzhi
|
c45d82ff75
|
取消打款查看
|
4 years ago |
zhengyongxing
|
99acaed972
|
公会信息登记功能补充
|
4 years ago |
zhengyongxing
|
eb6e027ef7
|
汇总结算单导出功能补充
|
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 |