merge

taskservice/lib/src/home/home.dart

@@ -247,14 +247,13 @@ class _MyHomePageState extends State<MyHomePage> {
                   color: JXColors.kF0F0F0,
                   child: ListView.builder(
                     padding: EdgeInsets.only(left: 12.0, right: 12.0),
-                    itemCount: _datasource.length,
+                    itemCount: _cells.length,
                     itemExtent: 92.0,
                     itemBuilder: (BuildContext context, int row) {
-                      return theCellBuilder(context, row);
+                      return _cells[row];
                     },
                   ),
                 )),
-            >>>>>>> 创建会员列表页面+对接数据库 1
         Row(
         mainAxisAlignment: MainAxisAlignment.start,
         children: <Widget>[