pointToNetwork/server @ 3ba9f90aea2f1ba4e7934ea6989d00ebfe28597d

lrf 48cf09bf19 Merge branch 'dev'		2 gadi atpakaļ
..
dev	64dfe17775 update	2 gadi atpakaļ
group	32d810a656 update	2 gadi atpakaļ
shop	48cf09bf19 Merge branch 'dev'	2 gadi atpakaļ
statistics	96fd808d63 统计:本日查询有bug	2 gadi atpakaļ
system	82032aa9fe update	2 gadi atpakaļ
trade	6f35d7a119 update	2 gadi atpakaļ
user	bcf9dab10d update	2 gadi atpakaļ
util	48f27a7662 计算活动价格的bug	2 gadi atpakaļ
view	7e8cc81970 用户订单相关统计;商品添加唯一编码	2 gadi atpakaļ