wangyingyang

Merge remote-tracking branch 'origin/master'

...@@ -2,4 +2,5 @@ org.gradle.daemon=true ...@@ -2,4 +2,5 @@ org.gradle.daemon=true
2 org.gradle.parallel=true 2 org.gradle.parallel=true
3 org.gradle.caching=true 3 org.gradle.caching=true
4 org.gradle.jvmargs=-Xmx3096m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 4 org.gradle.jvmargs=-Xmx3096m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
5 -org.gradle.configureondemand=true
...\ No newline at end of file ...\ No newline at end of file
5 +org.gradle.configureondemand=true
6 +org.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64
...\ No newline at end of file ...\ No newline at end of file
......