From bebe90c5aa5c02c9e57ac2d7942b554ef0fc3f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 21 Nov 2024 08:51:55 +0800
Subject: [PATCH] 'commit'

---
 ...ŸŽι•‡&δΉ‘ζ‘δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-双.xlsx | Bin 4450 -> 4450 bytes
 ...δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-εŒγ€ζˆζžœγ€‘.xlsx | Bin 102433 -> 102433 bytes
 .../dsideal/base/Tools/FillData/Area/A9.java  |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/待倄理/区/【9γ€‘εŸŽι•‡&δΉ‘ζ‘δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-双/εŸŽι•‡&δΉ‘ζ‘δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-双.xlsx b/Doc/待倄理/区/【9γ€‘εŸŽι•‡&δΉ‘ζ‘δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-双/εŸŽι•‡&δΉ‘ζ‘δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-双.xlsx
index 4ed01a6cd5fb4c019a52687552fe727791ba373d..7b2a8adddda257d73618bc93aa312a5ea86af11a 100644
GIT binary patch
delta 147
zcmaE)^hk*(z?+#xgn@&DgTcyeBTp40la<@%4n`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%dE95Y;A|

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

diff --git a/Doc/待倄理/区/【9γ€‘εŸŽι•‡&δΉ‘ζ‘δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-双/εŸŽι•‡&δΉ‘ζ‘δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-εŒγ€ζˆζžœγ€‘.xlsx b/Doc/待倄理/区/【9γ€‘εŸŽι•‡&δΉ‘ζ‘δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-双/εŸŽι•‡&δΉ‘ζ‘δΊΊε£ε˜εŒ–εŠι’„ζ΅‹-εŒγ€ζˆζžœγ€‘.xlsx
index 148d3c784fb57e055c324b6c577a4c7644af718c..c75fd2eaaa3e674773a9537af6bda0c4b20d5663 100644
GIT binary patch
delta 200
zcmZ3ufNkLdHl6@)W)=|!4h{~6Qn!sfRg6rfZksz8WkB@gWlZNm+;V0vM%MLuKO=um
zZex*?_;6;49~&bB!$u%R*1dTTORYLcy|vB{ura23Vqn@=Um8R=XBlkIGGNS$1+u5#
z>SeSC(b9d4<{&zxkI{ys)U7lUWcu_OP|=Hhj1C}K;eJL-5bf8`Xbqyf`x)Ip^yPj=
FKLFrBJ&*tZ

delta 200
zcmZ3ufNkLdHl6@)W)=|!4h{|mL)VQwRg6rAuA4g;WkB@gWlZNm+;V0vM%L-mYf8UO
zZex*?*t$fghmDbeVIvSD>)yPFrB)rJ-dg7e*cekiF);0`FAbubvkbOp88GI>0@>4V
z^)lLnXz4yia}XWU$7sW0=vo>HGJX0CsOZH$MhB3ra6h9Zi1zDev<A`L{furP`f@*`
F9{{u(H)#L>

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 6e11a0dd..be6e4869 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
@@ -110,7 +110,7 @@ public class A9 {
                         }
                         x = Double.parseDouble(q2) * mul;
                         String v2 = String.format("%.2f", (x > 1000 ? x / 10000 : x));
-                        DsKit.putData(outRow, Arrays.asList(cityName, areaName, year, v1, "", v2, ""), dataStyle);
+                        DsKit.putData(outRow, Arrays.asList(cityName, areaName, year.replace("εΉ΄δ»½","").replace("εΉ΄",""), v1, "", v2, ""), dataStyle);
                     }
                 }
 
@@ -138,7 +138,7 @@ public class A9 {
                         }
                         double x = Double.parseDouble(q2) * mul;
                         String v2 = String.format("%.2f", (x > 1000 ? x / 10000 : x));
-                        DsKit.putData(outRow, Arrays.asList(cityName, areaName, year, "", v1, "", v2), dataStyle);
+                        DsKit.putData(outRow, Arrays.asList(cityName, areaName, year.replace("εΉ΄δ»½","").replace("εΉ΄",""), "", v1, "", v2), dataStyle);
                     }
                 }
             }