Merge branch 'test' into 'master'

罗元桥

2021-07-15 d2baab8c43dca88365dac6e98a95ceee644001e2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java

@@ -113,6 +113,10 @@
     */
    private String finish;
    /**
     * 完成时间=反馈时间
     */
    private Date finishAt;
    /**
     * 驳回理由
     */
    private String rejectReason;