Merge remote-tracking branch 'origin/master' into master

hhhyyq

2021-03-17 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java

@@ -39,6 +39,8 @@
            "d.publish_at,\n" +
            "d.content,\n" +
            "d.cover,\n" +
            "d.cover_mode,\n" +
            "d.dyn_type,\n" +
            "d.create_at \n" +
            "FROM\n" +
            "com_pb_dyn d\n" +
@@ -47,6 +49,9 @@
            "<if test='partyBuildingComPbDynVO.communityId != null and partyBuildingComPbDynVO.communityId != 0'>" +
            "and d.community_id = #{partyBuildingComPbDynVO.communityId} \n" +
            " </if> " +
            "<if test='partyBuildingComPbDynVO.dynType != null and partyBuildingComPbDynVO.dynType != 0'>" +
            "and d.dyn_type = #{partyBuildingComPbDynVO.dynType} \n" +
            " </if> " +
            "<if test='partyBuildingComPbDynVO.title != null and partyBuildingComPbDynVO.title.trim() != &quot;&quot;'>" +
            "and d.title like concat(#{partyBuildingComPbDynVO.title},'%')  \n" +
            " </if> " +