Merge branch 'test_elder_cedoo' into test

CeDo

2021-06-11 a835b3046f5837fdbd107c6489a818eb77a8e8ec

Merge branch 'test_elder_cedoo' into test

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java

@@ -67,6 +67,10 @@
    @Resource
    private CommunityService communityService;


    @Value("${excel.elderimporturl}")
    private Object elderimporturl;

    /**
     * 新增高龄认证
     * @param {classNameFirstLower}AddDTO 添加高龄认证传递对象
@@ -195,4 +199,14 @@
        return communityService.addFeedback(eldersAuthFeedbackAddDTO);
    }

    /**
     * 获取高龄老人导入模板
     * @return 导入模板地址
     */
    @GetMapping("/imp/templates")
    @ApiOperation(value = "获取高龄老人导入模板", response = R.class)
    R getImportExcelUrl(){
        return R.ok(elderimporturl);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml

@@ -9,7 +9,7 @@
        <result property="name" column="name"/>
        <result property="code" column="code"/>
        <result property="value" column="value"/>
        <result property="describe" column="describe"/>
        <result property="description" column="description"/>
        <result property="createAt" column="create_at"/>
        <result property="createBy" column="create_by"/>
        <result property="communityId" column="community_id"/>
@@ -17,7 +17,7 @@

    <sql id="columns">
    <![CDATA[
        id,name,code,value,`describe`,create_at,create_by,community_id
        id,name,code,value,`description`,create_at,create_by,community_id
    ]]>
    </sql>