Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 a8ba074e4b0807cee707614a55e31e34ea0fbbde

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

@@ -122,7 +122,8 @@
            "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id \n" +
            "WHERE\n" +
            "w.id =#{id}"+
            " group by w.id "
            " group by w.id " +
            "order by w.create_at desc"
    )
    ComActMicroWishVO detailMicroWish(Long id);
    @Select("SELECT\n" +