solve some conflicts.

Signed-off-by: hackem <hackem@mzsea.com>
gson test.

Signed-off-by: hackem <hackem@mzsea.com>
mbatis tests.

Signed-off-by: hackem <hackem@mzsea.com>