Merge branch 'atie' into 'main'

Update MarhunController.php See merge request online-sistem1/lelong!53
2022-06-09 03:05:47 +00:00
parent edeea36f3e 07b0752e7b
commit 0fb4f17a4c
1 changed files with 1 additions and 1 deletions
@@ -466,7 +466,7 @@ class MarhunController extends Controller
        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
        ->where('cawangan.caw_code', $user->kodcaw)
        ->where('sts_lelong', 0)
-        ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
        ->groupBy('lelong_id')
        ->get()
        ->toArray();