Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!719

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -368,11 +368,11 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
                 failNum++;
                 failSb.append("订单编号:")
                         .append(deliverOrderExcel.getOrderId())
-                        .append("    商品ID:")
+                        .append("&nbsp;&nbsp;&nbsp;&nbsp;商品ID:")
                         .append(deliverOrderExcel.getGoodsId())
-                        .append("    商品名称:")
+                        .append("&nbsp;&nbsp;&nbsp;&nbsp;商品名称:")
                         .append(deliverOrderExcel.getTitle())
-                        .append("    发货失败原因:")
+                        .append("&nbsp;&nbsp;&nbsp;&nbsp;发货失败原因:")
                         .append(failContent)
                         .append("<br>");
             } else {
@@ -380,14 +380,14 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
             }
         }
 
-        sb.append("<pre>发货成功:")
+        sb.append("<div>发货成功:")
                 .append(successNum)
                 .append("<br>")
                 .append("发货失败:")
                 .append(failNum)
                 .append("<br>")
                 .append(failSb)
-                .append("</pre>");
+                .append("</div>");
 
         return sb.toString();
     }