# Conflicts:
# CMakeLists.txt
# common/inc/ToolUtils.h resolved by origin/develop(远端) version
# common/src/ToolUtils.cpp resolved by origin/develop(远端) version
# datacenter/bizService/F_DeleteData.h resolved by develop version
# datacenter/bizService/F_FormatData.h resolved by develop version
# datacenter/bizService/F_GetSaveCount.h resolved by develop version
# datacenter/bizService/F_GetSupportNum.h resolved by develop version
# datacenter/bizService/F_GetVersion.cpp resolved by develop version
# datacenter/bizService/F_InsertRecord.cpp resolved by develop version
# datacenter/bizService/F_Online.cpp resolved by develop version
# datacenter/bizService/F_SetSupportNum.h resolved by develop version
# datacenter/bizService/F_Tool.cpp resolved by develop version
# datacenter/bizService/F_UpdateRecord.cpp resolved by develop version
lisonwu
zgj