Merge branch 'main' of https://git.cjy.net.cn/zhangyan/hainan_2024

Laravel/app/Http/Controllers/API/H5/FenzhenController.php

@@ -385,13 +385,13 @@ class FenzhenController extends Controller
 
   public function item_desc($item)
   {
-    $canqian = $item->can_qian_hou == '餐前' ? '餐前' : '';
+//    $canqian = $item->can_qian_hou == '餐前' ? '餐前' : '';
     $beizhu = !!$item->beizhu ? $item->beizhu : '';
     $tishi = !!$item->tishi ? $item->tishi : '';
     $ret = [];
-    if (!!$canqian) {
+//    if (!!$canqian) {
-      $ret[] = $canqian;
+//      $ret[] = $canqian;
-    }
+//    }
     if (!!$beizhu) {
       $ret[] = $beizhu;
     }