https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git Conflicts: tiku_App/src/resources/test.properties
