From 1d70734941ac7a934cb084b79a76fd0f0e7c5c60 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 24 Mar 2022 17:51:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5-=E3=80=8B=E6=88=B7=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcHouseServiceImpl.java      |   2 +-
 ...V0.0.27__resiImportTemplateLabelUpdate.sql |   2 ++
 ...ic_resi_info_import_cid_for_easy_excel.xls | Bin 77824 -> 77824 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index b6d0585694..0835d6604e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -141,7 +141,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         return list.stream().map(item -> {
             OptionResultDTO dto = new OptionResultDTO();
             dto.setValue(item.getId());
-            dto.setLabel(item.getHouseName());
+            dto.setLabel(item.getDoorName());
             return dto;
         }).collect(Collectors.toList());
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql
new file mode 100644
index 0000000000..28ae0153da
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql
@@ -0,0 +1,2 @@
+-- 修改所属家庭项label为户号
+update ic_form_item set LABEL='户号' where LABEL='所属家庭';
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls
index 3be61c72adaa78a260aac4f6b24eaf4c5cf50aa7..99376d01a939f088169b23d518de99aa810e6c33 100644
GIT binary patch
delta 1997
zcmZvaYitx%6vxk<nceN~?0dKSpe-$kL6lGk22vWNbU|7cx<H{U1-7(6<qZX?NG&ZO
zqQy$!5H?0WNHl>$1j0nuNMtdh!9)~=1U^t$B=G?TunI`Q;<@{{P&AXdbANO0dHwHc
zO(?Ai<w&KB#j-E`s`!rlJa)-txRd_vl-;;O=f-QY2?y&ucvKmRqZALe(reY_VySL0
z9+&mFhqzmD<0T~*m(c!#?9?{t+&ZkVIB|;AhB1>3@0gs1;ROkBgC8%OyiCP0)&lgZ
z15>BezR7Q^s^=$}5C1TE@kp8mCy8t>8vxvXXb0Hka75Lp3W_mlvzztIiy;e-TWIz&
z58AAJUt{*VvNJyCpthu7s1M)-jx~GneY4(g$=G()*T?hY`JjwU*66}Gc{(%Jb5KxH
zP?Gfg!jeaE4^szr%(oQMK18bzZ&Frsa#eAq>Sb2i55ij(z2B6Hvd7`@s2-}hPcnzf
zYs84zX&8~_%T&LSqWW=_)#J~~_&v&=K1Ut8NQ0CTDXWKf#WhP<^(hUs9_xNZkw<J!
zXa`(_hOl4o+}M6O-Ie4A239>aJpD>&<-8d+3#Tr6a|`r=1lmjU*g70in$L={g7z9N
zqcw<aw6@^>(!65F$K2b<u7u*-KC9>*!3Q0ma%&blUo)mw*ZO#LAC&J5<ggsf4e+p|
zXboaGkT?5kS1RDJS?lYc4A=*n?xd{SmL6aGU#qJ-WgR%{tN*bc#50s7fHwj`@2@~}
zb1T7*gZ@^s$}oTjr;KZ%6F&rV@cKA=bn*a}h4;txHyqNfVgMU(!1(7360nhVcPq8(
z@fW15lDf#8PiB7<(F)7nljIFhh^HqGX9G1BEXlH}V5IO2RC<g?EmV0@lI$}v(r`eF
zSGgH`5j(f9QU3ux4i=aM6L4C%e0~`b|Hr@z<@998M*E3^>_kC94x&kdoJ5laxrizR
zxrsv96TUAUsn))0w@S$>j^n90-<Y1A53qU>K-F?yBgU&LG>r7niRfqpYm)0=3fk)e
zMN>sEUf?uAyg)unsp5Ho(*^MYXJ~KNow6GDz6!8-Bfx!aZo>rS2@&Q(6+YD%Y?&!M
zc@DaobX1;WmLQ&^S`g1MTM!pvjvy|=TtQrfh@fnu8X_j?K>{620EVFsi`Ly(=3=E7
zXbaN1y=^kBoo!vLR6Dcn0b`rB)9p6WM(f<Zl^Oj}fZ9C(54Ghxywp@mu`tX-d3X8z
zT9J!)QzwXbLz+LP*aAVkn}vdSH}!&eH!lg|-7M0^cGO6k_1!krc(4QD&qDw^w7nmm
zmmk%#81L>cwk;8Uyq2Zp_nSq!5=+klb<@I}T&brG0B?N>;P@8c@L3v&Ztd%1zl&iA
z!!jHe53=Rh9G^L3MLMWNGg}QS1=)yJ39=J42yzgu7UU#aBgjScvNq^Mk=OM3MF8DT
z03ZBJHT<nDxbQ-{rDnDk`&}Hy8dI$wy|hV{u3r;<+}z5f%{O{sPFF9~Zui3Ay<T|r
zK?X<nY-Ms2Fzx$xOX|W~m@6Yuw#uN>$>6M?VNJu`SVUo$(jqmpSE9!ZEWp-9AJV6Y
z=017TT%?JxUXYEbNsyiBH9-!d=2%k}Ys}u=m-&>9C(3$axqaDq#c^`YUuwmVtc1?C
Yw!gk_-<a6y{_G7sTNu0d3^N%11yC>#KL7v#

delta 2124
zcmZ{kd2Ccw6o=1!^Jd!F*LGg_kwh!nAQeSfY=;h&mZ1wRbcGq(N@Xcfc4d*;AevSY
zdq}I;D3~TvjHKqNbx9nINYEHmXrzBMr8R~`ODZ7&MG-uArgNn*&SdU;-#yDczjN=M
zmJzvSMD8osWS2;+y|%n08(hFYxAq)h{JHOc=W(wl2Mw~qa_~J(5D&?T=%HVQHW~Zq
zY0;+Q8hJYAX%&1x>%voVDwfF#{w!zVOxdNjYF%2U#|vgRb{ZUb!k|mi(|T8L*#JHS
z@Or!+kY{*CsGfMdVBlU#*wbT7r?_0>Lo{wMx?@Bs;V3=69n+dMVdb%o=!ysJ_AX<W
z5oG;@^_J1ioLDkZo!6veF0@*vVzWt?L={Hr9Dq8nXSxD#A{?dQt0s3+V$^!Du`!ep
z$^iMXu+@zrvL-~W13(JBBG!t(o7^~T4tD}O%?i$>Uyjj%E6nM5%B-*?;n8B$;kZeO
zbkAvyX6&}x6OD<aAsJtzet9f9=iMEhNw)hi(`?6POQOvXjh(0l_ZyOt#3q?08%R?`
zq8`7uL^h1P)SH&0vV3XLp`X-a&Z*PbAP&sCCuOXhVj+&zEUsEITC!oq(%{O)t6q8m
zlHo_R<)yLJI4v)OWnnSB_h1u^bFq!aW;~jgHb?r1N9);WNvQp^;>j5lIP?j(#<TOm
z+&XQ`?b#KW-Qi1NCQSA5w6kfPi&eg~+JP&PgxS?Q8t+V)3{BS}*7mhuY`xnm{}r)j
zR(~DC+KoTZDv#i}&+i@qE5PMJ?hd-kef+TmAOTC~?_pjX^{3$2d>d-=r^LOhZKjL0
z8?*8sG|Ird^?_v{*S;T61NnoJI<Me$NwXU=acJQTrl>Z*H{Oy0d@~rN(AQ*A1LY?r
ziB;kUJ;&5D6)uLGi=JaoVqH~X!vgaA2MpwEfkG${WF;yTWTW?mg6u?oK@Ortf}BJ}
zf?Pz!Xs-TSI#NTc|EWGPmdID%g24lRJiqK4LrMcc!zzFU>v(l|rlMGVCva0@G9Ibh
z%}Ow%-Z!gM<l{9i7Q|~T6U1xe$0(wP*SJJ|v;MTj(D5ul&GP`4UJRG8a#OK}O4y}Y
z4omUjZT>wKB8aE26vWe43F7Ii1@ZJXf_MvR1@RUv6U1AvTu=g0fQU&tkU$FyfMKB5
ztm?NHI9V>1wfSj$tF4H}OKn$Ju6m*U29vhzpVT}xc)-OBhAx1zZaP7S!^W*0>6&oY
zc5131h>p&}h81F2F04)v7gjHb3!_cAt#3~W;=)!6;=&pQabZuZrM*E(O?#uwsPFCt
z_~kf2tJ>Fd{=ZUIp{{q1b+riNrL3W_U(M3l{ySxvn1lD~-Z+3AUjazp0USOTb~^X@
zc;rxUd27)d^0Ov<IaIlH-9%=I4sZ>u7i1;cAjn44EXYo@QILaZlOQM2X7%wCv)qQ`
zLjc!C0S;aam#}#-Cn~D|w&3)kY_>I`|I6W4qcrr}9cnJSXy?XbOq#C5nC!V4V{-2G
z7?T4xCQpWLx|pU3m^%E5S>l(A&WDLPqm9%V8Jux2IGMz7{l-7~*U4-++R6gh*7a>1
z^Rew+mU!ly^^9nPh3-4uoA9ZS=#Oe4>=0xl+9}9Rw5z`@o^4C$sI+#bGe!P1v#`5A
nHJ#<l_PwPSPZynKUUF}_W-g!iX#b`uY@d!*^k2W9#l`&#^}#=j