Merge branch 'dev' of https://gitcode.net/dcloud/hello-uts into dev

* 'dev' of https://gitcode.net/dcloud/hello-uts:
  JSON.parse ignore 测试增加条件编译

# Conflicts:
#	uni_modules/uts-tests/utssdk/JSON.uts

uni_modules/uts-tests/utssdk/JSON.uts

@@ -196,10 +196,9 @@ export function testJSON() : Result {
       expect(cc1).toEqual(null)
       
       let cc2 = JSON.parse('{"a"2}',true)
-      expect(cc2).toEqual(null)
+      expect(cc2).toEqual(null)  
       // #endif
 
-
     })
     test('parseObject', () => {
       // #TEST JSON.parseObject