From ff8dcf856dfbb605cf75feb92dfa7957fdbd6d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 20 Nov 2024 10:16:55 +0800
Subject: [PATCH] 'commit'

---
 ...总人口变化及预测-双-(万人).xlsx | Bin 9091 -> 9091 bytes
 ...化及预测-双-(万人)【成果】.xlsx | Bin 3549 -> 0 bytes
 ...��镇&乡村人口变化及预测-双.xlsx | Bin 4450 -> 4450 bytes
 .../dsideal/base/Tools/FillData/Area/A8.java  |   4 ++--
 .../dsideal/base/Tools/FillData/Area/A9.java  |   4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx

diff --git a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx
index 6ed631cdfb85442028122e2bd52fb4019dfd1cd6..695e363129e16ab30d6b5dbceafce27f3d10ae90 100644
GIT binary patch
delta 200
zcmZp6Z+7Pm@MdNaVc_84U=Ro@*~mMQkr_yDUdX5kVVq@3f-sC&vLTEGtf>$N2YWq)
z(Zz9*3#=<nIF1#}*e~%PB6Uy-YR+5f(<~sV$-5Qo!1NylGcawcXbq-|6>Y%uCPj$+
dXGMF6ypjc&E>MDqZ&b1Z^WQ1Cf@w2lUjU7tId=d6

delta 200
zcmZp6Z+7Pm@MdNaVc_84VDOJF*vLDPkr_yDUdX5kVVq@3f-sC&vLTEGtf>$N2YWq)
z(Zz9*3#=<nIF1#}*e~%PB6Uy-YR+5f(<~sV$-5Qo!1NylGcawcXbq-|6>Y%uCPj$+
dXGMF6ypjc&E>MDqZ&b1Z^WQ1Cf@w2lUjVYRKTiMv

diff --git a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx
deleted file mode 100644
index d0cacfee2978170f67797cac63cc5f0936104ca4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3549
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

diff --git a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx
index a903bef1d5d088ffc41a2776efac5070e6a14d53..7cb517be8f7c4bf34bdf2baf5c225bce31416f52 100644
GIT binary patch
delta 147
zcmaE)^hk*(z?+#xgn@&DgF!NABTp40lVs554n`ReJ$V_^c@Vdp*%>Unhed=5#J|LL
z3(Q}~AqJ+8aY}>f$6RJCAZ^n8_8=;T-yB3u<+lM*m-%f$l#qY}hzb#~1X2A0)*$MP
LfE$Ps5%dE9tJ)<Y

delta 147
zcmaE)^hk*(z?+#xgn@&DgW-DMMxH80rt5*5I~Zj^^yFns=Rw?ZW@oVQ9u^TM5dRX}
zEiiu_hZvYX#wiV^A9I<pfV4^T+k>bWesd5tmEQ(LUFNq1Q9=R^ASy(_5=8Y2Sc9lD
L0&XBmM9>caFx)b0

diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
index 67fc123c..ca37731c 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
@@ -83,10 +83,10 @@ public class A8 {
                     System.exit(0);
                 }
                 //县区名称
-                //System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~");
+                System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~");
                 int firstChartNumber = 1;
                 List<List<String>> source1 =
-                        ExcelKit.getChartData(file.getAbsolutePath(), firstChartNumber, 6);//从2017年开始
+                        ExcelKit.getChartData(file.getAbsolutePath(), firstChartNumber, 0);//从2017年开始
 
 
                 ExcelKit.printTable(source1);
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
index b524c4c2..1800e55b 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
@@ -86,11 +86,11 @@ public class A9 {
                 //System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~");
                 int chartNumber = 2;
                 List<List<String>> source2 =
-                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber - 1, 6);
+                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber - 1, 0);
 
                 chartNumber = 3;
                 List<List<String>> source3 =
-                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber - 1, 6);
+                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber - 1, 0);
 
                 ExcelKit.printTable(source2);
                 ExcelKit.printTable(source3);