Merge branch 'master' of http://git.siwill.com/ifengouy/VisitorApp

 Conflicts:

	app/build.gradle

app/build.gradle

@@ -78,9 +78,11 @@ dependencies {
     implementation('com.jzxiang.pickerview:TimePickerDialog:1.0.1') {
         exclude group: 'com.android.support'
     }
-//    implementation 'com.android.support:appcompat-v7:28.0.0'
+
 
     implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.9'
     implementation 'com.github.gzu-liyujiang.AndroidPicker:FilePicker:4.1.9'
     implementation 'com.github.gzu-liyujiang.AndroidPicker:ImagePicker:4.1.9'
+    implementation 'com.github.gzu-liyujiang.AndroidPicker:CalendarPicker:4.1.9'
+    implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.9'
 }