 ELF
|
c4934613ae
|
解决冲突
|
5 years ago |
|
ELF
|
b0bc4c0496
|
解决冲突
|
5 years ago |
|
ELF
|
0f44d9e95c
|
解决冲突
|
5 years ago |
liuweiwen
|
08f8c518a6
|
从dev复制代码
|
5 years ago |
|
liuweiwen
|
7431072bbf
|
从dev复制代码
|
5 years ago |
chenxiaojun
|
6d215bda63
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
6012fdbdf1
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
02ccf125dc
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
365a276b95
|
公会分成管理--更新
|
5 years ago |
zhengyongxing
|
1a52a129f2
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
122a27634b
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
e73d795ace
|
生成下游结算单下拉选项框优化
|
5 years ago |
chenzhi
|
7ff7758df2
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
ef0b3c86f0
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
ce92602ca0
|
优化生成上游订单重复提醒
|
5 years ago |
|
zhengyongxing
|
c07167e784
|
结算单bug修正
|
5 years ago |
|
zhengyongxing
|
943969bddd
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
c09c3a591e
|
结算单bug修正
|
5 years ago |
|
zhengyongxing
|
8965fe8201
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Application/Admin/Controller/QueryController.class.php
|
5 years ago |
|
zhengyongxing
|
a2ce005497
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
71f2d75b8e
|
市场结算管理总流水点击查看各个渠道的流水
|
5 years ago |
|
chenxiaojun
|
ba9b5e33d1
|
更新
|
5 years ago |
|
chenxiaojun
|
d615a1402f
|
公会分成管理--更新
|
5 years ago |
|
liuweiwen
|
f480c20fb7
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
57a1d8ed8c
|
对账系统
|
5 years ago |
|
zhengyongxing
|
b735706006
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
7f99dafb2c
|
市场结算管理 上游结算流水bug修正
|
5 years ago |
|
liuweiwen
|
af28ff9155
|
工会归属查询
|
5 years ago |
|
liuweiwen
|
c7b9e2a7d6
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
a7e9f62367
|
对账系统自动登录
|
5 years ago |
|
liuweiwen
|
3f5791ff3f
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
51844a824e
|
工会归属会长必填
|
5 years ago |
|
liuweiwen
|
e2095af7a8
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
liuweiwen
|
49e0e19cc8
|
推广员与合作公司只能看到自己的公司的对账记录
|
5 years ago |
zhengchanglong
|
a67ffa18d6
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
6e405febc1
|
设置分成比例安卓IOS同步更新
|
5 years ago |
|
zhengyongxing
|
ae2ad86247
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
8b4c641f02
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengyongxing
|
3c9a828537
|
市场结算官方渠道检索修正
|
5 years ago |
|
chenzhi
|
4cd3d5b618
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
5996b5f45e
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
cc653c2d2d
|
优化tp1.id错误
|
5 years ago |
|
zhengyongxing
|
a4b53c4e9a
|
结算单管理字段名修正
|
5 years ago |
|
zhengyongxing
|
0c403ddf57
|
结算单管理字段名修正
|
5 years ago |
|
liuweiwen
|
64cdea78a3
|
工会归属管理
|
5 years ago |
|
zhengchanglong
|
868fde2d07
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
chenzhi
|
8ff8d1dab8
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
ac0405329f
|
优化编辑
|
5 years ago |
|
liuweiwen
|
21ee77609c
|
cp/工会对账系统
|
5 years ago |
|
zhengchanglong
|
1c00290da9
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |