From 6c0de8bd2b606b15271a5fe8be3f06f4c22bbb00 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Jun 2022 16:00:36 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=EF=BC=8C=E5=8D=95=E9=80=89=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=90=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V0.0.29__radio_default.sql  | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.29__radio_default.sql

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.29__radio_default.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.29__radio_default.sql
new file mode 100644
index 0000000000..f23b014497
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.29__radio_default.sql
@@ -0,0 +1,6 @@
+UPDATE ic_form_item
+SET DEFAULT_VALUE = '0',UPDATED_TIME=NOW()
+WHERE
+	ITEM_TYPE = 'radio'
+	AND DEL_FLAG = '0'
+	AND ( DEFAULT_VALUE IS NULL OR DEFAULT_VALUE = '' );

From 111c5d4f59a9cac60f400ca7c5b2f75baa1b4a12 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Jun 2022 17:32:50 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=EF=BC=9A=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=BA=94=E8=AF=A5=E5=A4=A7=E4=BA=8E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/WorkActServiceImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
index ee3924bdb5..7c4f924e20 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
@@ -162,9 +162,9 @@ public class WorkActServiceImpl implements WorkActService {
         //校验参数
 
         //校验 活动报名截止时间应该大于当前时间
-        if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
-            throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
-        }
+        // if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
+        //     throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
+        // }
         this.checkPublishFormDTO(actInfoEntity);
         PublishActResultDTO publishActResultDTO=new PublishActResultDTO();
         //内容审核（活动标题、招募要求、活动内容图文）
@@ -202,10 +202,10 @@ public class WorkActServiceImpl implements WorkActService {
         ActInfoEntity actInfoEntity=this.constructActInfo(formDTO);
         //校验参数
 
-        //校验 活动报名截止时间应该大于当前时间
-        if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
-            throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
-        }
+        // //校验 活动报名截止时间应该大于当前时间
+        // if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
+        //     throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
+        // }
         this.checkPublishFormDTO(actInfoEntity);
         PublishActResultDTO publishActResultDTO=new PublishActResultDTO();
         //内容审核（活动标题、招募要求、活动内容图文）

From c5acdbb09e64fc9cbba7ae398c0775bf3410e2c5 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Jun 2022 10:10:11 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=BB=9F=E8=AE=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/org/IcHouseDao.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml
index 297d15dbd3..1510478bc4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml
@@ -75,7 +75,7 @@
             AND g.CUSTOMER_ID = #{customerId}
         </if>
         GROUP BY
-        g.CUSTOMER_ID
+        g.CUSTOMER_ID,t.NEIGHBOR_HOOD_ID
     </select>
 
     <select id="neighborhoodStatStat" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">

From 54ca64cc7a021c1b254965b1fd609ab7e576d9ff Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 14 Jun 2022 11:09:21 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=94=BB=E5=8C=BA=E5=9F=9F=E6=97=B6?=
 =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/MapAddAreaFormDTO.java | 10 +++++++++
 .../java/com/epmet/dao/CustomerAgencyDao.java | 22 +++++++++++--------
 .../epmet/service/impl/AgencyServiceImpl.java |  2 +-
 .../resources/mapper/CustomerAgencyDao.xml    |  7 +++++-
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
index 8fcf455279..74d985a092 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
@@ -28,4 +28,14 @@ public class MapAddAreaFormDTO implements Serializable {
 
     @NotBlank(message = "coordinates不能为空",groups = MapAddAreaForm.class)
     private String coordinates;
+
+    /**
+     * 中心位置经度 经纬度同时填写才更新
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 1da4e74a33..5a757875ee 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -273,7 +273,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author zxc
      * @date 2021/10/25 9:59 上午
      */
-    void addMapArea(@Param("orgId") String orgId, @Param("level") String level, @Param("coordinates") String coordinates);
+    void addMapArea(@Param("orgId") String orgId, @Param("level") String level, @Param("coordinates") String coordinates, @Param("latitude") String latitude, @Param("longitude") String longitude);
 
     /**
      * @param pid
@@ -296,35 +296,39 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
 
     /**
      * desc:获取组织和网格的数据 树形sql
+     *
      * @param agencyId
      * @return
      */
     ExtStaffPermissionResultDTO selectAgencyAndGridById(@Param("agencyId") String agencyId);
+
     /**
      * @Description 【事件】社区服务热线
      * @author sun
      **/
     OrgMobileResultDTO getAgencyMobile(@Param("gridId") String gridId);
 
-    int updateSubAgencyAreaCodeById(@Param("customerId")String customerId, @Param("agencyId")String agencyId, @Param("operateUserId") String operateUserId);
+    int updateSubAgencyAreaCodeById(@Param("customerId") String customerId, @Param("agencyId") String agencyId, @Param("operateUserId") String operateUserId);
 
     /**
      * Desc: 查询组织下的社区
+     *
      * @param customerId
      * @param agencyId
      * @author zxc
      * @date 2022/3/21 15:23
      */
-    List<CommunityListResultDTO> getCommunityList(@Param("customerId")String customerId, @Param("agencyId")String agencyId);
+    List<CommunityListResultDTO> getCommunityList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
 
     List<SubOrgResDTO> selectSubOrg(String agencyId);
+
     /**
-    * @describe: 通过用户所属的行政组织和行政类型，查询下级的组织树
-    * @author wangtong
-    * @date 2022/5/18 17:23
-    * @params [formDto]
-    * @return java.util.List<com.epmet.dto.result.PartyOrgTreeResultDTO>
-    */
+     * @return java.util.List<com.epmet.dto.result.PartyOrgTreeResultDTO>
+     * @describe: 通过用户所属的行政组织和行政类型，查询下级的组织树
+     * @author wangtong
+     * @date 2022/5/18 17:23
+     * @params [formDto]
+     */
     List<PartyOrgTreeResultDTO> getOrgTreeByUserAndType(OrgTreeByUserAndTypeFormDTO formDto);
 }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index f984f295b4..aaeecb9818 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -709,7 +709,7 @@ public class AgencyServiceImpl implements AgencyService {
      */
     @Override
     public void mapAddArea(MapAddAreaFormDTO formDTO) {
-        customerAgencyDao.addMapArea(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getCoordinates());
+        customerAgencyDao.addMapArea(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getCoordinates(), formDTO.getLatitude(), formDTO.getLongitude());
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index b4f7dc0af3..d296b19ac2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -37,7 +37,12 @@
             ic_neighbor_hood
         </if>
         SET
-        COORDINATES = #{coordinates},
+        <if test="latitude != null and latitude.trim() != '' and longitude != null and longitude.trim() != ''">
+            LATITUDE = #{latitude},LONGITUDE = #{longitude},
+        </if>
+        <if test="coordinates != null and coordinates.trim() != ''">
+            COORDINATES = #{coordinates},
+        </if>
         UPDATED_TIME = NOW()
         WHERE ID = #{orgId}
         AND DEL_FLAG = '0'

From cf60b2ece5856c0786ef7970daae395d1d5ffb4d Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 14 Jun 2022 12:20:37 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E7=94=BB=E5=8C=BA=E5=9F=9F=E6=97=B6?=
 =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=20=E6=AD=A3=E5=88=99=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
index 74d985a092..11943c7114 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
 /**
@@ -32,10 +33,12 @@ public class MapAddAreaFormDTO implements Serializable {
     /**
      * 中心位置经度 经纬度同时填写才更新
      */
+    @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的经度值")
     private String longitude;
 
     /**
      * 中心位置纬度
      */
+    @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的纬度值")
     private String latitude;
 }

From 8ce8a1ab8286bc6db91d7b0c1d14536a7cb83c3b Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 14 Jun 2022 12:39:06 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E7=94=BB=E5=8C=BA=E5=9F=9F=E6=97=B6?=
 =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=20=E6=AD=A3=E5=88=99=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
index 11943c7114..0f4ba3494f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
@@ -33,12 +33,12 @@ public class MapAddAreaFormDTO implements Serializable {
     /**
      * 中心位置经度 经纬度同时填写才更新
      */
-    @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的经度值")
+    @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的经度值",groups = MapAddAreaForm.class)
     private String longitude;
 
     /**
      * 中心位置纬度
      */
-    @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的纬度值")
+    @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的纬度值",groups = MapAddAreaForm.class)
     private String latitude;
 }

From d330fbb1236bc882ab1fecd08b8de7e435055fdf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 14 Jun 2022 12:56:24 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=AF=BC=E5=85=A5error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...cCommunitySelfOrganizationServiceImpl.java |  27 ++++++++++--------
 .../templates/self_org_import_template.xlsx   | Bin 8959 -> 8998 bytes
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
index cb063772c0..698045aa65 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
@@ -534,19 +534,19 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     //社会自组织名称重复
                     communitySeltOrgList.forEach(org -> {
                         if (obj.getOrganizationName().equals(org.getOrganizationName())) {
-                            log.warn(String.format("当前客户下的社会自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum()));
-                            errMsg.append("客户下社会自组织名称已存在;");
+                            log.warn(String.format("当前客户下的社区自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum()));
+                            errMsg.append("客户下社区自组织名称已存在;");
                             bl.set(true);
                         }
                     });
-                    //手机号不合规
-                    boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone());
-                    boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone());
-                    if (!m && !t){
-                        errMsg.append("手机号码不合法;");
-                        bl.set(true);
-                        log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName());
-                    }
+                    // //手机号不合规
+                    // boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone());
+                    // boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone());
+                    // if (!m && !t){
+                    //     errMsg.append("手机号码不合法;");
+                    //     bl.set(true);
+                    //     log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName());
+                    // }
                     if(bl.get()){
                         excel = new CommunitySelfOrgImportExcel();
                         //excel.setAgencyName(obj.getOrganizationName());
@@ -565,12 +565,15 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     e.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
                     e.setPid(agencyInfo.getPid());
                     e.setPids(agencyInfo.getPids());
-                    e.setOrganizationCreatedTime(DateUtils.parse(l.getOrganizationCreatedTime(), DATE_PATTERN));
+                    e.setOrganizationCreatedTime(StringUtils.isNotBlank(l.getOrganizationCreatedTime()) ? DateUtils.parse(l.getOrganizationCreatedTime(), DATE_PATTERN) : new Date());
                     //赋值分类编码，excel输入的是分类名称，需要找到admin字典库中的key
                     for (String key : categoryMap.keySet()) {
+                        log.info("*******key="+key+";categoryMap.get(key)="+categoryMap.get(key)+";e.getCategoryCode()="+e.getCategoryCode());
                         if (StringUtils.isNotBlank(categoryMap.get(key)) && categoryMap.get(key).equals(e.getCategoryCode())) {
-                            e.setCategoryCode(categoryMap.get(key));
+                            e.setCategoryCode(key);
                             break;
+                        }else{
+                            e.setCategoryCode(StrConstant.EPMETY_STR);
                         }
                     }
                     List<IcCommunitySelfOrganizationPersonnelEntity> persons = new ArrayList<>();
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx
index 0f67e0f0e10eec5ce7dce62970360c5c736146ac..6f5622382d9d99a41dfb98478fe6df1f010dfd51 100644
GIT binary patch
delta 4305
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

delta 4235
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