so-manager/so-manager-dev.com
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: so-manager:fcf07cecc42d72135bc0dee0fb4f542c2edfe748
Branches Tags
so-manager:main
so-manager:main_higashide
so-manager:main_watanabe
so-manager:main_go
..
compare: so-manager:a085a47e04ab262449698f6e752dd3a731b4d76a
Branches Tags
so-manager:main
so-manager:main_higashide
so-manager:main_watanabe
so-manager:main_go

No commits in common. "fcf07cecc42d72135bc0dee0fb4f542c2edfe748" and "a085a47e04ab262449698f6e752dd3a731b4d76a" have entirely different histories.
fcf07cecc4 ... a085a47e04

1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
app/Http/Controllers/RegularContractController.php
View File

@ -90,7 +90,7 @@ class RegularContractController extends Controller
->join('usertype', 'regular_contract.user_categoryid', '=', 'usertype.user_categoryid') ->join('usertype', 'regular_contract.user_categoryid', '=', 'usertype.user_categoryid')
->leftJoin('city', 'park.city_id', '=', 'city.city_id') ->leftJoin('city', 'park.city_id', '=', 'city.city_id')
->where('regular_contract.user_id', $user_id) ->where('regular_contract.user_id', $user_id)
->whereNotNull('regular_contract.contract_money') ->whereNotNull('regular_contract.contract_periods')
->select( ->select(
'regular_contract.contract_id', 'regular_contract.contract_id',
'park.park_name', 'park.park_name',