hongze/fms_api @ d6c09d24bb9f056a4366e0aa90c123b701423ff1

xiexiaoyuan f2b38902fe Merge branch 'master' into dev/2.2_daokuan		2 lat temu
..
payment.go	a72bd2f47f test 开票/到款登记对应合并汇总、商品到款统计列表、编辑付款方式、分配套餐金额	2 lat temu
pre_payment.go	7154332dfd fix	2 lat temu
register.go	f2b38902fe Merge branch 'master' into dev/2.2_daokuan	2 lat temu
service.go	6f6a3b36c4 Revert "获取套餐列表"	2 lat temu