Commit Graph

6032 Commits (637f22c22be0f23e14d3f9a391ec00881f370b98)
 

Author SHA1 Message Date
廖金灵 d73ab9c4cd Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
陈志 f63985ece1 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修改
ELF a4d4a51a2c 完善支付商户操作日志
陈志 f57fb45ae0 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 3318298d2e 优化上下游导出时间
zhengyongxing 9a722d5b45 市场结算管理bug修改
yulingwei c308bbbd6c upt
yulingwei 9e53db53cd upt
yulingwei de0fc5e074 upt
chenzhi 205c6a83f8 优化上游结算
chenzhi 6f75b0e6d8 优化结算单无地址
yulingwei 19c3aeec50 Merge branch 'feature/promote_base_info' of 47.111.118.107:wmtx/platform into feature/promote_base_info
yulingwei a88b182641 upt
陈志 f99614e130 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 493197fed2 优化重新结算
陈志 21052650eb Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 91510679b0 Merge branch 'fix/change_compnay_info0729' of 47.111.118.107:wmtx/platform into fix/change_statement_time
chenzhi aabc0703df 优化结算时间选择
chenzhi 8b8b0721b3 优化结算时间
chenzhi 853c938edb 优化下游个人结算时间
chenzhi 92ccc96dcd 优化下游公司结算时间审核
chenzhi a14f0abb88 上游新增结算时间判断
廖金灵 57ea4efb72 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
充值订单bug修改
zhengyongxing 8c237e19fe 充值订单bug修改
廖金灵 79f038d62a Merge branch 'hotfix/market_percentage' of wmtx/platform into release
付商户bug修改
zhengyongxing 24bcd381a0 支付商户bug修改
廖金灵 782f2ae51b Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付商户bug修改
廖金灵 3c4cf05a72 Merge branch 'feature/reward' of wmtx/platform into release
列表样式
zhengyongxing eb66cfd5d4 支付商户bug修改
yulingwei d46fa808c0 upt
陈志 67dc1b58e6 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 0f284cf9b3 优化游戏绑定,已经绑定不出现
廖金灵 4b6218f1aa Merge branch 'feature/reward' of wmtx/platform into release
修改选择样式
廖金灵 bd00e90c26 Merge branch 'feature/payment_merchant' of wmtx/platform into release
修改文字bug
ELF bc193e648e 修改
yulingwei f598b19957 Merge branch 'feature/reward' of 47.111.118.107:wmtx/platform into feature/reward
yulingwei b995ba34d9 upt
zhengyongxing 19f59d6482 菜单栏修改
廖金灵 4911aa1629 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
商户bug修改
zhengyongxing eebb38dc8c 商户列表字段名称修改
zhengyongxing 9d28947f9b 商户bug修改
zhengyongxing a960e0a7e4 商户bug修改
廖金灵 6fff9b2fd3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
商户bug修改
zhengyongxing 624a2b7cde 商户bug修改
zhengyongxing 9a202a393e 商户bug修改
廖金灵 8cca85de27 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
商户bug修改
zhengyongxing ee5fc4c7c8 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/View/Spend/lists.html
zhengyongxing 9670bf86b6 商户bug修改
廖金灵 6faa6e0a33 Merge branch 'feature/finance_statement723' of wmtx/platform into release
优化订单列表长cp订单显示
廖金灵 7340d5b4fd Merge branch 'hotfix/market_percentage' of wmtx/platform into release
手机号码重复验证