Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into equity-m

app/api/logic/ActivityLogic.php

@@ -98,7 +98,7 @@ class ActivityLogic extends BaseLogic
                     $goods_coupon_id = CouponGoods::where(['goods_id'=>$item['id']])->value('coupon_id')??0;
                     if($goods_coupon_id){
                         $coupon = CouponRules::where(['id'=>$goods_coupon_id])->field('code,server_category_name')->findOrEmpty();
-                        $coupon && $item['server_category_name'] = $coupon['server_category_name'];
+                        $coupon && $item['server_category_name'] = nl2br($coupon['server_category_name'],false);
                         $coupon && $item['code'] = $coupon['code'];
                     }
                     foreach ($reserved_fields as $field => $value) {