1、解决合并的冲突

lib/components/dialog_date.dart

@@ -32,6 +32,8 @@ class VDialogDate extends StatelessWidget {
     this.maxValue,
   });
 
+  Future<DateTime?> show<DateTime>() => VAlertDialog.showDialog<DateTime>(this);
+
   @override
   Widget build(BuildContext context) {
     DateTime initialDateTime = initialValue ?? DateTime.now();