20210927xts00

Signed-off-by: N guduhanyan <xuyanjun27@163.com>

20210927xts00
Signed-off-by: N guduhanyan <xuyanjun27@163.com>
509b1ad2 · guduhanyan · d8b434f1 · 67cddaeb · 509b1ad2
隐藏空白更改
内联并排

Showing with 4 addition and 0 deletion

miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js ...Test_js/src/main/js/default/test/SystemTimeJsunit.test.js +4 -0

未找到文件。
--- a/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js
+++ b/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js
@@ -1745,7 +1745,11 @@ describe('TimeTest', function() {
     */
    it('systemTime_setTimezone_test29', 0, async function (done) {
        console.log("SUB_systemTime_setTimezone_JS_API_2900 start")
+<<<<<<< HEAD
        systemTime.setTimezone("AAAAAAAAAAAAAAAAAAAAAAAAAA")
+=======
+        systemTime.setTimezone("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
+>>>>>>> 67cddaeb9d46468d0842acd9543d07c76b15457e
            .then(data =>{
            console.log("setTimezone ===data " + data)
        }).catch(error => {