更改解决冲突

Guo_shaoshan

2023-04-04 d5d541f6bc23fd70875bbc706639b7e48d50468a

 gradle.properties

@@ -21,3 +21,8 @@
android.nonTransitiveRClass=true

android.injected.testOnly=false

KEY_PATH=zhangshiapp.keystore
KEY_PASS=123456
ALIAS_NAME=alias
ALIAS_PASS=123456