Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -338,7 +338,10 @@ class ProjectUpdate extends Command
                                     //名称去掉特殊符号
                                     //名称去掉特殊符号
                                     $item['ttile'] = $this->special2str($item['ttile'] ?? '');
                                     $item['ttile'] = $this->special2str($item['ttile'] ?? '');
                                     //短描述处理换行
                                     //短描述处理换行
-                                    $intro = str_replace("\r\n", "<br>", $item['short_description'] ?? '');
+                                    $intro = $item['short_description'] ?? '';
+                                    if (strpos($intro, "\r\n") !== false) {
+                                        $intro = "<p>" . str_replace("\r\n", "</p><p>", $intro) . "</p>";
+                                    }
                                     //详情
                                     //详情
                                     $content = $item['content'] ?? '';
                                     $content = $item['content'] ?? '';
                                     try {
                                     try {