Merge remote-tracking branch 'origin/master'

sc-service/src/main/java/com/huyi/service/credit/controller/OwnCreditController.java

@@ -436,7 +436,9 @@ public class OwnCreditController extends BaseController {
         //核心企业盖章日期
         String openDate = "";
         if(financeFileRelList.size() > 0){
-            openDate = DateUtils.parseDateToStr("yyyy年MM月dd日",financeFileRelList.get(0).getZffrCoreTime());
+            if(CommonUtil.isNotEmpty(CommonUtil.objToString(financeFileRelList.get(0).getZffrCoreTime()))){
+                openDate = DateUtils.parseDateToStr("yyyy年MM月dd日",financeFileRelList.get(0).getZffrCoreTime());
+            }
         }
         map.put("openDate",openDate);
         return AjaxResult.success(map);