Commit Graph

3799 Commits (29789f5ef6a8cea4654cfa1f5037623b9c6b5259)
 

Author SHA1 Message Date
chenxiaojun 29789f5ef6 公会分成管理--更新
chenxiaojun b7dd9c5b45 财务管理--更新
sunke dbf04c25c5 错误修改
zhengyongxing 75f2d09b10 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 3fca3c89ad 短信验证码提交
chenxiaojun b367b4a8d3 公会分成管理--更新
chenxiaojun df97ff401a 财务管理--更新
sunke 126c7755db 资料填写地址默认
chenxiaojun 693f8c9991 财务管理--更新
zhengyongxing 3741b0d27f 市场结算修正
chenxiaojun 42e07d0f2f 结算管理--更新
chenxiaojun 66a238dfd4 结算管理--更新
ELF 5c0a38c02a Merge branch 'feature/site_sms' into release
ELF 1e232e827b Merge branch 'feature/site_sms' into dev
ELF 9b3f105e5a 修改bug
ELF 1f5dfac6d2 Merge branch 'feature/site_sms' into dev
ELF 14e65c8314 修改短信发送bug
zhengyongxing 1ba566a02c 市场结算修正
zhengyongxing a68858d4ed Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF 32c689df21 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 04742809f2 Merge branch 'feature/site_sms' into dev
zhengyongxing 9d5b877220 市场结算生成下游代码修改
ELF 828252cee9 修改短信发送bug
chenxiaojun 6e05546db6 公会分成管理--更新
sunke 7ac22521dd 姓名只留姓
chenxiaojun 71e02a4add 结算管理--更新
ELF 70ade1c071 Merge branch 'feature/site_sms' into dev
ELF afa7aa8988 修改短信服务bug
chenxiaojun 28897755c9 结算管理--更新
ELF 33ebc763e6 Merge branch 'feature/site_sms' into dev
ELF f6eb5d8008 修改bug
chenxiaojun 258e10c9d1 结算管理--更新
zhengyongxing 4c42ee90e3 市场结算生成下游对账单代码优化
zhengyongxing 136f565f9f 市场结算管理设备类型条件修正
ELF c4b768879e Merge branch 'feature/site_sms' into dev
zhengyongxing f86265d38c 市场结算管理设备类型条件修正
chenxiaojun 2e1742c759 推广提现--更新
zhengchanglong d054e70c73 Merge branch 'release' into dev
# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html
zhengyongxing 38cea3f972 用户列表导出锁定备注bug修正
chenxiaojun 63d947f754 推广提现--更新
chenxiaojun 517d4ec05f 公会分成管理--更新
chenxiaojun 48ca90bbf3 公会分成管理--更新
liuweiwen cdfa8e4eee admin权限
liuweiwen 1b2cf94c9b Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 21806993d4 admin权限
ELF e4daff1be8 修改短信接口
zhengyongxing 43a335bc28 市场结算管理总流水弹窗优化
liuweiwen c8b184b877 Merge remote-tracking branch 'origin/release' into release
liuweiwen 86fe5f1f9f 工会归属admin不加密推广员账号
zhengyongxing 16814af0d2 市场结算管理总流水弹窗优化