Merge remote-tracking branch 'origin/master'

sinake

8 天以前 e5c4a1f16552f115c9c5407b6008ebd9f230c747

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java

@@ -494,4 +494,5 @@
        dataMap.put("WCRQ", sformat.format(donationCompletion.getCompletetime()) == null ? "" : sformat.format(donationCompletion.getCompletetime()));

    }

}