Merge remote-tracking branch 'origin/master'

CeDo

2021-04-09 8178368d34a9f358982966fd440693c6f792d292

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java

@@ -17,7 +17,7 @@
    /**
     * 社区问卷列表
     */
    R ListQuestnaire(PageQuestnaireDTO pageQuestnaireDTO);
    R PageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO);
    /**
     * 修改问卷状态
     */

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

@@ -86,7 +86,7 @@
    }

    @Override
    public R ListQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) {
    public R PageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) {
        Page userPage = new Page(pageQuestnaireDTO.getPageNum(), pageQuestnaireDTO.getPageSize());
        LambdaQueryWrapper<ComActQuestnaireDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
        if (pageQuestnaireDTO.getTitle() != null) {