Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 a8ba074e4b0807cee707614a55e31e34ea0fbbde

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java

@@ -22,7 +22,7 @@
            " com_act_questnaire aq \n" +
            " LEFT JOIN sys_user u on aq.create_by = u.user_id \n" +
            " where aq.is_hide=0 " +
            "<if test='communityId != null and communityId!=0 '>\n" +
            "<if test='communityId != null and communityId!=0l '>\n" +
            " and aq.community_id = #{communityId}\n" +
            " </if> " +
            "<if test='pageQuestnaireDTO.state != null '>\n" +