Merge remote-tracking branch 'origin/upgrade' into upgrade

src/main/java/com/cm/population/utils/AreaUtils.java

@@ -33,7 +33,7 @@ public class AreaUtils {
     public void init() {
         new Thread(() -> {
             PopulationInfoStaticService = PopulationInfoService;
-           /* initArea0();
+            initArea0();
             initArea1();
             initArea2();
             initArea3();
@@ -42,7 +42,7 @@ public class AreaUtils {
             aree.put(1, area1);
             aree.put(2, area2);
             aree.put(3, area3);
-            aree.put(4, area4);*/
+            aree.put(4, area4);
         }).start();
     }
 

src/main/resources/templates/populationinfo/list-creator.html

@@ -358,7 +358,6 @@
                 height: $win.height() - 90,
                 limit: 20,
                 limits: [20, 40, 60, 80, 100, 200],
-                defaultToolbar: [],
                 toolbar: '#headerToolBar',
                 request: {
                     pageName: 'page',