57 Commits (a31e3bf1ab4fc5706914da37c04c055040c6b26f)

Author SHA1 Message Date
tping 43c62c05d7 Merge branch 'release' into feature/zgc_1126
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
4 years ago
tping d8924dc8be 1126 客服qq 4 years ago
ELF ef8334dd18 添加域名前缀限制 4 years ago
tping 0d52dc7d61 1126 4 years ago
ELF c339623c78 优化 4 years ago
elf@home dd66846e68 根据推广公司配置推广后台 4 years ago
chenzhi f311da5208 优化银行卡号不限制 4 years ago
zhengyongxing 1f3b2d1ec7 Merge branch 'feature/new_item' of 47.111.118.107:wmtx/platform into feature/add_item 4 years ago
zhengyongxing 0631c22c93 上游导出修正 4 years ago
zyx 570e476efb 公司添加是否为内部公司 4 years ago
zhengyongxing ba1778c112 公司支付宝打款修正 4 years ago
ELF 1b949af7f5 优化 4 years ago
ELF 1e5c0cca66 测试 4 years ago
ELF 8d98bd5a36 优化 4 years ago
ELF 6596e01a29 修改 4 years ago
ELF e0bbec0978 修改 4 years ago
ELF e441f030c0 优化 4 years ago
ELF 9b88e97672 修改 4 years ago
ELF 42547128d4 优化押金 4 years ago
elf@home 50755b89c5 修改 4 years ago
chenzhi aabc0703df 优化结算时间选择 4 years ago
chenzhi 8b8b0721b3 优化结算时间 4 years ago
chenzhi fb9deff8b7 优化新增生效的默认时间 4 years ago
chenzhi b0034d5f19 优化推广公司游戏申请不审核 4 years ago
chenzhi b1790a8897 优化手机不限制 4 years ago
chenzhi 1e3b1dad66 优化排序 4 years ago
chenzhi 3ad0d447d4 优化显示 4 years ago
chenzhi 61e6d8131c 新增支付宝真实名称只能是中文验证 4 years ago
chenzhi bffbd6a2b1 优化ok 4 years ago
chenzhi 2619e598e8 合并marster 4 years ago
chenzhi cafdc39f2a 优化添加 4 years ago
chenzhi f731a417bd 优化工会关系 4 years ago
chenzhi d9d55a3bcb 优化新增下游公司 4 years ago
chenzhi 69adcbabf8 优化推广公司 4 years ago
zhengyongxing 0ca629518d 市场专员业绩结算结构修改 4 years ago
zhengyongxing ca5c68d078 推广公司编辑添加合并错误去除 4 years ago
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
4 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
4 years ago
yulingwei 0decb03cb1 merge 4 years ago
yulingwei f969802c26 upt 4 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi a9e0b303dd 推广公司新增支付宝账号 5 years ago
chenzhi bf24f9bc9d 开户网点该帐户名 5 years ago
chenzhi 644e38fd1f 优化空值3 5 years ago
chenzhi 644100dc3b 优化空值修改2 5 years ago
chenzhi 3b6f8c70cc 优化可以为空填写 5 years ago
zhengyongxing 7a96d4b6c0 Merge branch 'feature/modify_bug' into fix/admin_second_optimization 5 years ago
zhengyongxing 742d3b5470 管理后台推广公司管理及合作方管理部分文字修改 5 years ago
chenzhi e770a00cbb 优化推广公司必填项目 5 years ago
chenzhi 9f7e15caac 优化推广公司检验规则 5 years ago