Merge branch 'master' of https://gitee.com/lansetudou/oasystem

app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 5,
-      "versionName": "1.0.5",
+      "versionCode": 6,
+      "versionName": "1.0.6",
       "outputFile": "app-release.apk"
     }
   ]

baselib/build.gradle

@@ -113,7 +113,7 @@ dependencies {
 
     //图片选择
     api 'io.github.lucksiege:pictureselector:v2.7.3-rc08'
-    api 'me.rosuh:AndroidFilePicker:0.7.0-x'
+    api 'me.rosuh:AndroidFilePicker:0.7.4-x'
 
     //加载动画
     api "com.jcodecraeer:xrecyclerview:$rootProject.ext.xRecyclerViewVersion"

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.0-rc'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
         jcenter()