diff --git a/app/src/main/java/com/zww/sample/KtApp.kt b/app/src/main/java/com/zww/sample/KtApp.kt index e0d6ac87..53c0f74a 100644 --- a/app/src/main/java/com/zww/sample/KtApp.kt +++ b/app/src/main/java/com/zww/sample/KtApp.kt @@ -28,3 +28,4 @@ class KtApp : Application() { //2022-06-15 13:42:29add ~ //2022-06-15 13:42:47add ~ //2022-06-15 13:43:48add ~ +//2022-06-15 13:46:03add ~ diff --git a/app/src/main/java/com/zww/sample/Te.kt b/app/src/main/java/com/zww/sample/Te.kt index 0a4e4f5e..ec1ba79f 100644 --- a/app/src/main/java/com/zww/sample/Te.kt +++ b/app/src/main/java/com/zww/sample/Te.kt @@ -6,9 +6,13 @@ package com.zww.sample * 文件描述: */ data class Tl(val tl1:StrictMath,val tl2:LinkageError) +<<<<<<< HEAD 123 data class T10086(val is10086True:StrictMath,val tl2:LinkageError) data class T10086(val is10086True:StrictMath,val tl2:LinkageError) data class T10086(val is10086True:StrictMath,val tl2:LinkageError) data class T10086(val is10086True:StrictMath,val tl2:LinkageError) +======= +>>>>>>> a870ffef0fab8c2201da840280ce5383bfa139b6 +data class T10086(val is10086True:StrictMath,val tl2:LinkageError)