Commit Graph

297 Commits (c55084645475dd1209e3ecf40ed542adc1e600de)

Author SHA1 Message Date
ELF c550846454 修改
ELF 977cfcba3c 修改
ELF c20d071817 修改
ELF 40123f8c50 修改
ELF 530dded4e7 优化
ELF 5253a76963 优化
ELF 3a6b912399 优化
ELF afc95791d2 优化
ELF 1f3eaa06da 修改
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
ELF e1352fea1e 修改
ELF dd71ccdf83 修改
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
ELF 34586b228e 修改
ELF 8c8d01a446 修改评级
ELF 3a4fb51222 修改支付商户规则bug
ELF 65c5a221fc 修改
ELF b44a5118cf 修改
ELF 36c240c608 修改
ELF a10bb888da 修改bug
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
ELF 2ae89b9edb 解决冲突
ELF 9b11202deb 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
ELF ca99068a0e 修改
ELF 19c782b053 解决冲突
ELF 268ea4e34d 修改
zhengyongxing dab8251c11 Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
 Conflicts:
	Application/Admin/Controller/AggregateFinanceStatementController.class.php
	Data/update.sql
ELF 6fcaa1362c 重置权限缓存
ELF 6da122550c 优化
zhengyongxing f95b593455 Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change
# Conflicts:
#	Application/Base/Tool/AggregateClient.class.php
#	Data/update.sql
zhengyongxing 3c698adba9 上游导出修正
ELF 16122d5d9f 修改
chenzhi f169d65c1c 优化推广公司添加排序
ELF 050eb98843 xiugai
ELF 2c9092273f 修改
elf@home 1dd594f46f 修改bug
廖金灵 6a78824b10 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
ELF 268e084241 修改
廖金灵 931c837d7e Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
ELF 9d67a4c842 优化
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
ELF 6596e01a29 修改
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
ELF 6e2fda1e26 解决冲突
ELF 32bc839dcd 合并