Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
LiuY 2024-01-02 10:55:25 +08:00
commit 4e7e404684
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/cm/population/utils/AreaUtils.java
View File

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

1
src/main/resources/templates/populationinfo/list-creator.html
View File

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