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

1 year ago · a5c326ec01
parent d7f8ae9c57 cd2f92ea53
commit a5c326ec01
1 changed files with 4 additions and 4 deletions
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/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) {
-      $ret[] = $canqian;
-    }
+//    if (!!$canqian) {
+//      $ret[] = $canqian;
+//    }
    if (!!$beizhu) {
      $ret[] = $beizhu;
    }