142 Commits (12f4cda85099373f418b791ce7ea4f692b9ea334)

Author SHA1 Message Date
tping 1dbc61a602 1 4 years ago
tping 858e929199 甲乙方公司 4 years ago
tping 304c59be10 甲乙方公司 4 years ago
tping 08df25eab3 展示错误 4 years ago
tping e79f18e618 1211 审核列表 甲乙方公司 4 years ago
tping 31ce7b071c 1211 4 years ago
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
zhengyongxing b32f5efd91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others
 Conflicts:
	Data/update.sql
4 years ago
tping dd786dc27f 1126 批量上下架 4 years ago
tping b722175785 1126 权限 4 years ago
tping 033cd00aee 1126 4 years ago
zhengyongxing c749df4936 11月功能提交 4 years ago
tping d8924dc8be 1126 客服qq 4 years ago
zhengyongxing 5add29fa6b 11月功能提交 4 years ago
zhengyongxing 2040991894 11月功能提交 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
zhengyongxing 1626640066 11月功能提交 4 years ago
tping 025d90f5fa 1126 4 years ago
tping c75d73c9f7 1126 4 years ago
zhengyongxing f49cd75e86 11月功能提交 4 years ago
zhengyongxing 4526b5b741 11月功能提交 4 years ago
chenzhi f311da5208 优化银行卡号不限制 4 years ago
zhengyongxing fedcbd605b bug修改 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
万盟天下 2f0ecf6302 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug
4 years ago
ELF 8f4b86ee2e 优化 4 years ago
廖金灵 548c76bd99 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
4 years ago
ELF 1b949af7f5 优化 4 years ago
chenzhi 9c11344906 优化下游推广公司导出 4 years ago
ELF 1e5c0cca66 测试 4 years ago
ELF 1fb2fa7e81 解决冲突 4 years ago
ELF 8d98bd5a36 优化 4 years ago
zhengyongxing ae8cf5ad38 上游导出修正 4 years ago
郑永星 7f3de4d901 Merge branch 'feature/company_export_change' of wmtx/platform into release
下游导出修正
4 years ago
zhengyongxing f0c425ae82 下游导出修正 4 years ago
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
4 years ago
ELF 6596e01a29 修改 4 years ago
zhengyongxing 65532fc0ab Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other
 Conflicts:
	Application/Admin/Controller/PromoteCompanyController.class.php
	Application/Base/Tool/AggregateClient.class.php
4 years ago
ELF 32bc839dcd 合并 4 years ago
ELF e0bbec0978 修改 4 years ago
ELF ad2037408d 优化 4 years ago
ELF e441f030c0 优化 4 years ago
ELF 9b88e97672 修改 4 years ago
ELF 42547128d4 优化押金 4 years ago