Merge branch 'test_elder_cedoo' into test

CeDo

2021-06-11 3a4c910adc41f934400e2f4a583e7d89b61e89f7

Merge branch 'test_elder_cedoo' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordForCommunityVO.java

@@ -1,6 +1,7 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -20,7 +21,7 @@
 * */
@Data
@ApiModel("高龄认证记录返回参数")
@EncryptQueryClass
@EncryptDecryptClass
public class ComEldersAuthRecordForCommunityVO {

    @ApiModelProperty(value = "ID")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java

@@ -420,7 +420,8 @@
        Page page = new Page();
        page.setCurrent(pageEldersAuthElderlyDTO.getPageNum());
        page.setSize(pageEldersAuthElderlyDTO.getPageSize());
        return R.ok(eldersAuthDAO.selectCommunityEldersRecordByPage(page, pageEldersAuthElderlyDTO));
        IPage<ComEldersAuthRecordForCommunityVO> ipage = eldersAuthDAO.selectCommunityEldersRecordByPage(page, pageEldersAuthElderlyDTO);
        return R.ok(ipage);
    }
    @Override
    public R setCommunityAuthType(Long communityId, Integer type) {