Merge branch 'master' of https://github.com/CRM2014/cf into SabrinaWang
Signed-off-by: SabrinaWang <673458347@qq.com>
。。
Signed-off-by: xiaoping <xiaoping>

xml database和报表
Merge commit '500f36288e1381d2b221b1313b440de3282559bc'
Merge commit '83549ee43dc5bfc2c7cbbaa5a0ff58ca249ac4a8'