companyProjecet.git

summary
reflog
commits
tree
docs
forks
compare

商品可以价格面议选择走访时显示输入走访企业名分会添加活动时要总会审核分类添加人数限制，添加活动选择了填写人数限制的分类时活动名额下显示该分类人数...

quanwei

yesterday a4b3ee325c7354579d495bc74a777e494e5ec38c

 admin/app/branch/model/branch/Branch.php

@@ -27,7 +27,7 @@
            $model = $model->where('is_takeout', '=', $params['is_takeout']);
        }
        // 查询列表数据
        return $model->with(['superUser'])
        return $model->with(['superUser', 'logo'])
            ->where('parent_branch_id', '=', $branch_id)
            ->where('is_delete', '=', '0')
            ->order(['create_time' => 'desc'])

			@@ -27,7 +27,7 @@
			$model = $model->where('is_takeout', '=', $params['is_takeout']);
			}
			// 查询列表数据
			return $model->with(['superUser'])
			return $model->with(['superUser', 'logo'])
			->where('parent_branch_id', '=', $branch_id)
			->where('is_delete', '=', '0')
			->order(['create_time' => 'desc'])