Merge "Modify sql and restructure"
authorGuangrong Fu <fu.guangrong@zte.com.cn>
Mon, 6 Mar 2017 03:41:45 +0000 (03:41 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 6 Mar 2017 03:41:45 +0000 (03:41 +0000)

Trivial merge