3058 Commits (a6812d26e451ba6ece00e5860498c6ef7053fb92)

Author SHA1 Message Date
郑永星 c62ad6e69d Merge pull request '12.28功能提交' (#54) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/54
4 years ago
zhengyongxing 9c0006ef45 12.28功能提交 4 years ago
郑永星 a9aca61c73 Merge pull request '12.28功能提交' (#53) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/53
4 years ago
zhengyongxing f855835501 12.28功能提交 4 years ago
郑永星 444cff5f64 Merge pull request '12.28功能提交' (#52) from feature/add_item into release
12.28功能提交
4 years ago
zhengyongxing d1b0ec55a8 12.28功能提交 4 years ago
郑永星 1496fa349a Merge pull request '12.28功能提交' (#51) from feature/add_item into release
12.28功能提交
4 years ago
zhengyongxing 0293fd7ff1 12.28功能提交 4 years ago
zhengyongxing bb73235874 12.28功能提交 4 years ago
郑永星 12434fb840 Merge pull request 'feature/add_item' (#50) from feature/add_item into release
12.28功能提交
4 years ago
zhengyongxing e84ce56293 12.28功能提交 4 years ago
zhengyongxing 08d235c03a 12.28功能提交 4 years ago
zhengyongxing 3c166a913e Merge branch 'feature/update_payment' into feature/add_item
# Conflicts:
#	Application/Admin/Controller/CompanyStatementOfflineController.class.php
#	Application/Admin/Controller/StatementMangementController.class.php
#	Application/Payment/Controller/PaymentController.class.php
#	Application/Payment/View/Payment/lists.html
#	Data/update.sql
4 years ago
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' (#46) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
4 years ago
郑永星 ad7dc1f46d Merge pull request 'feature/update_payment' (#40) from feature/update_payment into release
12.28功能提交
4 years ago
zhengyongxing ffa78964ec 12.28功能提交 4 years ago
zhengyongxing 29e8421266 12.28功能提交 4 years ago
zhengyongxing 4f2f18ad91 12.28功能提交 4 years ago
zhengyongxing 82592dd457 12.28功能提交 4 years ago
zhengyongxing c716535975 12.28功能提交 4 years ago
zhengyongxing 552a6f8181 12.28功能提交 4 years ago
zhengyongxing 6a86a5e76f 12.18功打款能提交 4 years ago
zhengyongxing 8a6191810b 12.18功打款能提交 4 years ago
tping ccf0589e4f 导入 4 years ago
tping 824b7b3f06 公会信息导入导出 4 years ago
zhengyongxing 8430fa1813 12.18功能提交 4 years ago
tping 24fcfc4b90 公会信息 4 years ago
张谷成 0c7e4b2d30 Merge pull request 'hotfix/1211bug' (#35) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
4 years ago
tping 304c59be10 甲乙方公司 4 years ago
tping d6f34127df 1 4 years ago
张谷成 91701cc612 Merge pull request '公会信息' (#34) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/34
4 years ago
廖金灵 feb46d1954 Merge pull request 'feature/add_item_two' (#33) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
4 years ago
zhengyongxing 699449a702 未结算数据的补充 4 years ago
zhengyongxing 0c49d1d655 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two 4 years ago
zhengyongxing c30e396b2c 未结算数据的补充 4 years ago
zhengyongxing 32abdbb390 汇总统计修改 4 years ago
chenzhi fc75b7d81d 优化统计 4 years ago
chenzhi 79588d52e8 优化财务汇总 4 years ago
tping 0aef9e3019 公会信息 4 years ago
郑永星 6699ce1045 Merge pull request '未结算数据的补充' (#23) from feature/add_item into release
未结算数据的补充
4 years ago
zhengyongxing f13ee0583c 未结算数据的补充 4 years ago
chenzhi fb798e82bf 优化下游推广公司搜索 4 years ago
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
4 years ago
郑永星 ca8a2ada0e Merge pull request '12月功能提交,手机万能验证码屏蔽提交' (#7) from feature/add_item into release
12月功能提交,手机万能验证码屏蔽提交
4 years ago
zhengyongxing 309b195986 12月功能提交 4 years ago
陈志 79ad02ba2e Merge pull request '优化' (#9) from feature/st_mange_20201202 into release
优化
4 years ago
chenzhi 1945cae9a5 优化 4 years ago
张谷成 6e63a3857e Merge pull request 'feature/1211' (#8) from feature/1211 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
4 years ago
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
4 years ago
tping 6c266178df 数据互通 4 years ago