diff --git a/app/Admin/Controllers/AdmissionNewStudentController.php b/app/Admin/Controllers/AdmissionNewStudentController.php
index 0ea4db0..04d2154 100644
--- a/app/Admin/Controllers/AdmissionNewStudentController.php
+++ b/app/Admin/Controllers/AdmissionNewStudentController.php
@@ -59,6 +59,19 @@ class AdmissionNewStudentController extends AdminController
             //开启导出功能
             $grid->export(new ImportStudentExporter());
 
+            //检测是否有筛选年届条件
+            $request = request();
+            if(empty($request->input("annual_session"))){
+                //取出当前年份
+                $config = Config::query()->where([
+                    "unique_identification" => "annual_session"
+                ])->first();
+
+                $grid->model()->where("annual_session", $config->data);
+            }else{
+                $grid->model()->where("annual_session", $request->input("annual_session"));
+            }
+
             $grid->column('id')->sortable();
             $grid->column('is_new_student')->display(function () {
                 return $this->is_new_student == 1 ? "新生" : "老生";
@@ -113,7 +126,12 @@ class AdmissionNewStudentController extends AdminController
                     return "是";
                 }
             })->help("为测试账号时则不受系统开放时间限制");;
+            $grid->column('zero_enrol')->display(function ($val){
+                if($val == AdmissionNewStudents::ZERO_ENROL_NO) return "否";
+                if($val == AdmissionNewStudents::ZERO_ENROL_YES) return "是";
+            });
             $grid->column('status')->select([1=>"正常", 2=>"禁用"]);
+
             $grid->column('create_time')->display(function (){
                 if(!empty($this->create_time)){
                     return date("Y-m-d H:i:s", $this->create_time);
@@ -174,6 +192,21 @@ class AdmissionNewStudentController extends AdminController
                 $filter->equal('day_student')->select([1 => "否", 2 => "是"]);
                 $filter->equal('is_push')->select([1 => "否", 2 => "是"]);
                 $filter->equal('status')->select([1 => "正常", 2 => "禁用"]);
+                $filter->equal('zero_enrol')->select([
+                    AdmissionNewStudents::ZERO_ENROL_NO => "否",
+                    AdmissionNewStudents::ZERO_ENROL_YES => "是",
+                ]);
+                $filter->equal('annual_session', '年届')->select(function (){
+                    $list =  AdmissionNewStudents::query()->distinct("annual_session")->get("annual_session")->toArray();
+                    if(empty($list)) return [];
+                    $list = array_column($list, "annual_session");
+                    $result = [];
+                    foreach($list as $item){
+                        $result[$item] = $item;
+                    }
+
+                    return $result;
+                });
                 $filter->between('create_time')->datetime()->toTimestamp();
             });
 
@@ -295,6 +328,10 @@ class AdmissionNewStudentController extends AdminController
                 1 => "否",
                 2 => "是",
             ])->required();
+            $form->select('zero_enrol')->options([
+                AdmissionNewStudents::ZERO_ENROL_NO => "否",
+                AdmissionNewStudents::ZERO_ENROL_YES => "是",
+            ])->required();
             $form->hidden("annual_session");
             $form->hidden("create_time");
             $form->hidden("update_time");
diff --git a/app/Admin/Controllers/AllocationDormitoryBedController.php b/app/Admin/Controllers/AllocationDormitoryBedController.php
index f187a22..a95fb9f 100644
--- a/app/Admin/Controllers/AllocationDormitoryBedController.php
+++ b/app/Admin/Controllers/AllocationDormitoryBedController.php
@@ -58,12 +58,18 @@ class AllocationDormitoryBedController extends AdminController
             //开启导出功能
             $grid->export(new ImportBedExporter());
 
-            //取出当前年份
-            $config = Config::query()->where([
-                "unique_identification" => "annual_session"
-            ])->first();
+            //检测是否有筛选年届条件
+            $request = request();
+            if(empty($request->input("annual_session"))){
+                //取出当前年份
+                $config = Config::query()->where([
+                    "unique_identification" => "annual_session"
+                ])->first();
 
-            $grid->model()->where("annual_session", $config->data);
+                $grid->model()->where("annual_session", $config->data);
+            }else{
+                $grid->model()->where("annual_session", $request->input("annual_session"));
+            }
 
             $grid->column('id')->sortable();
 
@@ -141,6 +147,11 @@ class AllocationDormitoryBedController extends AdminController
                     return $info->speciality_name;
                 }
             })->help("未显示专业时请检查是否已经分配专业");
+
+            $grid->column('zero_enrol')->display(function ($val){
+                if(AllocationDormitoryBed::ZERO_ENROL_NO == $val) return "否";
+                if(AllocationDormitoryBed::ZERO_ENROL_YES == $val) return "是";
+            });
             $grid->column('status')->select([1=>"正常", 2=>"禁用"]);
 
             $grid->filter(function (Grid\Filter $filter) {
@@ -201,6 +212,22 @@ class AllocationDormitoryBedController extends AdminController
                 $filter->equal('bed_id')->select(Bed::query()->pluck("bed_number as value", "id"));
                 $filter->equal('sex')->select([1 => "男", 2 => "女"]);
                 $filter->equal('status')->select([1 => "正常", 2 => "禁用"]);
+                $filter->equal('zero_enrol')->select([
+                    AllocationDormitoryBed::ZERO_ENROL_NO => "否",
+                    AllocationDormitoryBed::ZERO_ENROL_YES => "是",
+
+                ]);
+                $filter->equal('annual_session', '年届')->select(function (){
+                    $list =  AllocationDormitoryBed::query()->distinct("annual_session")->get("annual_session")->toArray();
+                    if(empty($list)) return [];
+                    $list = array_column($list, "annual_session");
+                    $result = [];
+                    foreach($list as $item){
+                        $result[$item] = $item;
+                    }
+
+                    return $result;
+                });
             });
 
             // 禁用详情按钮
@@ -284,6 +311,10 @@ class AllocationDormitoryBedController extends AdminController
             $form->select('sex', '性别')->options([1 => '男', 2 => '女'])->required();
             $form->select('status', '状态')->options([1 => '正常', 2 => '禁用'])->required();
             $form->select('day_student', '走读生')->options([1 => '否', 2 => '是'])->required();
+            $form->select('zero_enrol')->options([
+                AllocationDormitoryBed::ZERO_ENROL_NO => '否',
+                AllocationDormitoryBed::ZERO_ENROL_YES => '是'
+            ])->required();
 
 
             $form->hidden("annual_session");
diff --git a/app/Admin/Controllers/MinimumLimitTuitionController.php b/app/Admin/Controllers/MinimumLimitTuitionController.php
new file mode 100644
index 0000000..09ab2be
--- /dev/null
+++ b/app/Admin/Controllers/MinimumLimitTuitionController.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\MinimumLimitTuition;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class MinimumLimitTuitionController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new MinimumLimitTuition(), function (Grid $grid) {
+            //开启边框模式
+            $grid->withBorder();
+            // 开启字段选择器功能
+            $grid->showColumnSelector();
+
+            $grid->column('id')->sortable();
+            $grid->column('price');
+            $grid->column('type')->display(function ($val){
+                if($val == MinimumLimitTuition::TYPE_NEW) return "新生";
+                if($val == MinimumLimitTuition::TYPE_OLD) return "老生";
+            });
+            $grid->column('status')->select([
+                MinimumLimitTuition::STATUS_YES => "正常",
+                MinimumLimitTuition::STATUS_NO => "禁用",
+            ]);
+            $grid->column('create_time');
+            $grid->column('update_time');
+
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+
+            });
+
+            // 禁用创建按钮
+            $grid->disableCreateButton();
+            // 禁用删除按钮
+            $grid->disableDeleteButton();
+            //禁用批量操作按钮
+            $grid->disableBatchDelete();
+            // 禁用详情按钮
+            $grid->disableViewButton();
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new MinimumLimitTuition(), function (Show $show) {
+            $show->field('id');
+            $show->field('price');
+            $show->field('type');
+            $show->field('status');
+            $show->field('create_time');
+            $show->field('update_time');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new MinimumLimitTuition(), function (Form $form) {
+            $form->display('id');
+            $form->number('price')->required();
+            /*$form->select('type')->options([
+                MinimumLimitTuition::TYPE_NEW => "新生",
+                MinimumLimitTuition::TYPE_OLD => "老生",
+            ])->required()->help("修改时注意不要出现多个同类型");*/
+            $form->select('status')->options([
+                MinimumLimitTuition::STATUS_YES => "正常",
+                MinimumLimitTuition::STATUS_NO => "禁用",
+            ])->required();
+
+            // 去除删除按钮
+            $form->disableDeleteButton();
+
+            // 去除跳转详情按钮
+            $form->disableViewButton();
+
+            $form->footer(function ($footer) {
+
+                // 去掉`查看`checkbox
+                $footer->disableViewCheck();
+
+                // 去掉`继续编辑`checkbox
+                $footer->disableEditingCheck();
+
+                // 去掉`继续创建`checkbox
+                $footer->disableCreatingCheck();
+
+            });
+
+        });
+    }
+}
diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index 124861a..c659a08 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -4,6 +4,7 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Extensions\Exporter\ImportOrder;
 use App\Admin\Renderable\PayProjectTable;
+use App\Models\Config;
 use App\Models\Order;
 use App\Models\PaymentList;
 use App\Models\SecondaryCollege;
@@ -32,6 +33,19 @@ class OrderController extends AdminController
             //开启导出功能
             $grid->export(new ImportOrder());
 
+            //检测是否有筛选年届条件
+            $request = request();
+            if(empty($request->input("annual_session"))){
+                //取出当前年份
+                $config = Config::query()->where([
+                    "unique_identification" => "annual_session"
+                ])->first();
+
+                $grid->model()->where("annual_session", $config->data);
+            }else{
+                $grid->model()->where("annual_session", $request->input("annual_session"));
+            }
+
             $grid->column('id')->sortable();
             $grid->column('annual_session')->help("对应缴费年份,如2022-2023则表示缴纳该年份的费用");
             $grid->column('idcard')->display(function($info){
@@ -145,7 +159,6 @@ class OrderController extends AdminController
                     }
                     $query->where('unique_number', $unique_number);
                 }, '手机号/身份证/姓名');
-                $filter->equal('annual_session');
                 $filter->equal('is_new_student_order')->select(function (){
                     return [
                         Order::IS_NEW_STUDENT_ORDER_NEW => "新生",
@@ -159,6 +172,17 @@ class OrderController extends AdminController
                         Order::STATUS_CANCEL => "已取消"
                     ];
                 });
+                $filter->equal('annual_session', '年届')->select(function (){
+                    $list =  Order::query()->distinct("annual_session")->get("annual_session")->toArray();
+                    if(empty($list)) return [];
+                    $list = array_column($list, "annual_session");
+                    $result = [];
+                    foreach($list as $item){
+                        $result[$item] = $item;
+                    }
+
+                    return $result;
+                });
                 $filter->between('pay_time')->datetime()->toTimestamp();
             });
 
diff --git a/app/Admin/Controllers/SelectedDormitoryController.php b/app/Admin/Controllers/SelectedDormitoryController.php
index 46061f2..f3990a5 100644
--- a/app/Admin/Controllers/SelectedDormitoryController.php
+++ b/app/Admin/Controllers/SelectedDormitoryController.php
@@ -54,6 +54,19 @@ class SelectedDormitoryController extends AdminController
             // 开启字段选择器功能
             $grid->showColumnSelector();
 
+            //检测是否有筛选年届条件
+            $request = request();
+            if(empty($request->input("annual_session"))){
+                //取出当前年份
+                $config = Config::query()->where([
+                    "unique_identification" => "annual_session"
+                ])->first();
+
+                $grid->model()->where("annual_session", $config->data);
+            }else{
+                $grid->model()->where("annual_session", $request->input("annual_session"));
+            }
+
             $grid->column('id')->sortable();
             $grid->column('annual_session');
             $grid->column('idcard')->display(function($info){
@@ -152,6 +165,17 @@ class SelectedDormitoryController extends AdminController
                     $query->where('unique_number', $unique_number);
                 }, '手机号/身份证/姓名');
                 $filter->equal('status', '状态')->select([1 => "正常", 2 => "禁用"]);
+                $filter->equal('annual_session', '年届')->select(function (){
+                    $list =  SelectedDormitory::query()->distinct("annual_session")->get("annual_session")->toArray();
+                    if(empty($list)) return [];
+                    $list = array_column($list, "annual_session");
+                    $result = [];
+                    foreach($list as $item){
+                        $result[$item] = $item;
+                    }
+
+                    return $result;
+                });
 
             });
             $grid->actions(function (Grid\Displayers\Actions $actions) {
@@ -390,7 +414,8 @@ class SelectedDormitoryController extends AdminController
                 //检测是否被选
                 $checkSelect = SelectedDormitory::query()->where([
                     "allocation_dormitory_id" => $checkBedInfo->id,
-                    "status" => SelectedDormitory::STATUS_YES
+                    "status" => SelectedDormitory::STATUS_YES,
+                    "annual_session" => $config->data,
                 ])->first();
                 if(!empty($checkSelect)){
                     // 中断后续逻辑
@@ -427,22 +452,36 @@ class SelectedDormitoryController extends AdminController
                     $updateOrder = Order::query()->where("id", $orderInfo->id)->update([
                         "selected_dormitory_id" => $checkBedInfo->id,
                         "dormitory_price" => $checkMultiplWorldInfo->price,
-                        "update_time" => time()
+                        "update_time" => time(),
+                        "annual_session" => $config->data,
+                        "dormitory_id" => $checkBedInfo->dormitory_type,
+                        "multiple_id" => $checkBedInfo->multiple_worlds,
                     ]);
                     if(empty($updateOrder)){
                         throw new \Exception("同步订单信息失败");
                     }
 
-                    //删除用户已选宿舍后面所有步骤
-                    CompletedStep::query()->where([
+                    //取出用户信息
+                    $userInfo = UsersMember::query()->where([
                         "unique_number" => $thisSelectInfo->unique_number,
-                    ])->where("step_id", ">=", 5)->delete();
+                    ])->first();
+                    if(empty($userInfo)){
+                        throw new \Exception("用户信息不存在");
+                    }
 
-                    //删除已生成报到单
-                    ReportFormInfo::query()->where([
-                        "unique_number" => $thisSelectInfo->unique_number,
-                        "annual_session" => $config->data,
-                    ])->delete();
+                    //当前新选择的宿舍床位专业跟着用户专业改变
+                    $newBedInfo = AllocationDormitoryBed::query()->where([
+                        "id" => $checkBedInfo->id,
+                    ])->update([
+                        "speciality_id" => $userInfo->speciality_id,
+                        "update_time" => time(),
+                    ]);
+                    if(empty($newBedInfo)){
+                        throw new \Exception("更新新选床位专业失败");
+                    }
+
+                    //取出拼接完整的宿舍地址
+                    $allocatioDormitoryName = SelectedDormitory::getSelectedBedName($checkBedInfo);
 
                     //同步当前已分配信息
                     $updateSelectInfo = SelectedDormitory::query()->where([
@@ -451,13 +490,31 @@ class SelectedDormitoryController extends AdminController
                     ])->update([
                         "allocation_dormitory_id" => $checkBedInfo->id,
                         "status" => SelectedDormitory::STATUS_YES,
-                        "allocation_dormitory_name" => "",
+                        "allocation_dormitory_name" => $allocatioDormitoryName,
                         "update_time" => time(),
                     ]);
                     if(empty($updateSelectInfo)){
                         throw new \Exception("同步当前已分配宿舍信息失败,请重试~");
                     }
 
+                    //检测当前年份是否存在报道单，是则更新宿舍地址
+                    $checkReport = ReportFormInfo::query()->where([
+                        "unique_number" => $thisSelectInfo->unique_number,
+                        "annual_session" => $config->data,
+                    ])->first();
+
+                    if(!empty($checkReport)){
+                        $updateReportInfo = ReportFormInfo::query()->where([
+                            "id" => $checkReport->id,
+                        ])->update([
+                            "bed_name" => $allocatioDormitoryName,
+                            "update_time" => time(),
+                        ]);
+                        if(empty($updateReportInfo)){
+                            throw new \Exception("更新报道单信息失败");
+                        }
+                    }
+
                     DB::commit();
                     redirect(url('admin/selected_dormitory'));
                 }catch (\Exception $e){
diff --git a/app/Admin/Controllers/UsersMemberController.php b/app/Admin/Controllers/UsersMemberController.php
index d36f9ca..9a34ef0 100644
--- a/app/Admin/Controllers/UsersMemberController.php
+++ b/app/Admin/Controllers/UsersMemberController.php
@@ -11,6 +11,7 @@ use App\Admin\Renderable\UserFamilyTable;
 use App\Models\AdmissionNewStudents;
 use App\Models\CompletedOfflineStep;
 use App\Models\CompletedStep;
+use App\Models\Config;
 use App\Models\OfflineStep;
 use App\Models\SecondaryCollege;
 use App\Models\Speciality;
@@ -98,8 +99,16 @@ class UsersMemberController extends AdminController
                 return UserFamilyMeberTable::make()->payload(["unique_number"=>$this->unique_number]);
             });
             $grid->column("step", "步骤一")->display('线上报到进度')->modal( function (){
+                //取出当前年份
+                $config = Config::query()->where([
+                    "unique_identification" => "annual_session"
+                ])->first();
+
                 $step = Step::query()->orderBy("sort", "asc")->get()->toArray();
-                $successStep = CompletedStep::query()->where("unique_number", $this->unique_number)->get()->toArray();
+                $successStep = CompletedStep::query()->where([
+                    "annual_session" => $config->data,
+                    "unique_number" => $this->unique_number
+                ])->get()->toArray();
                 $tableData = [];
                 if(!empty($successStep)){
                     $successStepIds = array_column($successStep, "step_id");
@@ -118,8 +127,15 @@ class UsersMemberController extends AdminController
                 return Table::make(array_column($step, "title"), $resultData);
             });
             $grid->column("offlineStep", "步骤二")->display('线下报到进度')->modal( function (){
+                //取出当前年份
+                $config = Config::query()->where([
+                    "unique_identification" => "annual_session"
+                ])->first();
                 $step = OfflineStep::query()->orderBy("sort", "asc")->get()->toArray();
-                $successStep = CompletedOfflineStep::query()->where("unique_number", $this->unique_number)->get()->toArray();
+                $successStep = CompletedOfflineStep::query()->where([
+                    "annual_session" => $config->data,
+                    "unique_number" => $this->unique_number
+                ])->get()->toArray();
                 $tableData = [];
                 if(!empty($successStep)){
                     $successStepIds = array_column($successStep, "step_id");
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index 0202fe0..d361019 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -39,4 +39,5 @@ Route::group([
     $router->resource("/security_user", "SecurityUserController");
     $router->resource("/loan_students_list", "LoanStudentsListController");
     $router->resource("/config_list", "ConfigController");
+    $router->resource("/minimum_limit_tuition", "MinimumLimitTuitionController");
 });
diff --git a/app/Models/AdmissionNewStudents.php b/app/Models/AdmissionNewStudents.php
index 426cb6c..01a549b 100644
--- a/app/Models/AdmissionNewStudents.php
+++ b/app/Models/AdmissionNewStudents.php
@@ -25,4 +25,7 @@ class AdmissionNewStudents extends Model
 
     const IS_PUSH_NO = 1; //未推送
     const IS_PUSH_YES = 2; //已推送
+
+    const ZERO_ENROL_NO = 1; //是否允许0元入学 否
+    const ZERO_ENROL_YES = 2; //是
 }
diff --git a/app/Models/AllocationDormitoryBed.php b/app/Models/AllocationDormitoryBed.php
index 96e64e0..c5c18f8 100644
--- a/app/Models/AllocationDormitoryBed.php
+++ b/app/Models/AllocationDormitoryBed.php
@@ -14,4 +14,7 @@ class AllocationDormitoryBed extends Model
 
     const STATUS_YES = 1; //正常
     const STATUS_NO = 2; //禁用
+
+    const ZERO_ENROL_NO = 1; //是否允许0元入学 否
+    const ZERO_ENROL_YES = 2; //是
 }
diff --git a/app/Models/MinimumLimitTuition.php b/app/Models/MinimumLimitTuition.php
new file mode 100644
index 0000000..a1209f1
--- /dev/null
+++ b/app/Models/MinimumLimitTuition.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+
+use Illuminate\Database\Eloquent\Model;
+
+class MinimumLimitTuition extends Model
+{
+	use HasDateTimeFormatter;
+
+
+    protected $table = 'minimum_limit_tuition';
+
+    const CREATED_AT = 'create_time';
+    const UPDATED_AT = 'update_time';
+    public $timestamps = true;
+
+    public function freshTimestamp()
+    {
+        return time();
+    }
+
+
+    /*避免转换时间戳为时间字符串*/
+    public function fromDateTime($value)
+    {
+        return $value;
+    }
+
+
+    protected function serializeDate(\DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
+
+    const TYPE_NEW = 1; //类型 1新生 2老生
+    const TYPE_OLD = 2;
+
+    const STATUS_YES = 1; //状态 1正常
+    const STATUS_NO = 2; //禁用
+}
diff --git a/app/Models/SelectedDormitory.php b/app/Models/SelectedDormitory.php
index 11d4d95..e96de69 100644
--- a/app/Models/SelectedDormitory.php
+++ b/app/Models/SelectedDormitory.php
@@ -167,4 +167,74 @@ class SelectedDormitory extends Model
 
         return $result;
     }
+
+    /**
+     * 写入已选宿舍信息时拼接完整的宿舍名
+     * @param $dormitoryBed
+     * @return string
+     */
+    public static function getSelectedBedName($dormitoryBed, $type = 1)
+    {
+        $dormitoryTypeInfo = DormitoryType::query()->where([
+            "id" => $dormitoryBed["dormitory_type"],
+            "status" => DormitoryType::STATUS_YES
+        ])->first()->toArray();
+
+        //多人间
+        $multipleInfo = MultipleWorld::query()->where([
+            "id" => $dormitoryBed["multiple_worlds"],
+            "dormitory_type_id" => $dormitoryBed["dormitory_type"],
+            "status" => MultipleWorld::STATUS_YES
+        ])->first()->toArray();
+
+        //生活区
+        $livingInfo = LivingArea::query()->where([
+            "id" => $dormitoryBed["living_area"],
+            "status" => LivingArea::STATUS_YES
+        ])->first()->toArray();
+
+        //楼栋
+        $buildingInfo = Building::query()->where([
+            "id" => $dormitoryBed["building_id"],
+            "status" => Building::STATUS_YES
+        ])->first()->toArray();
+
+        //楼层
+        $floorInfo = Floor::query()->where([
+            "id" => $dormitoryBed["floor_id"],
+            "status" => Floor::STATUS_YES
+        ])->first()->toArray();
+
+        //宿舍号
+        $dormitory = DormitoryNumber::query()->where([
+            "id" => $dormitoryBed["dormitory_number"],
+            "status" => DormitoryNumber::STATUS_YES
+        ])->first()->toArray();
+
+        //床位号
+        $bed = Bed::query()->where([
+            "id" => $dormitoryBed["bed_id"],
+            "status" => Bed::STATUS_YES
+        ])->first()->toArray();
+
+        //返回数据
+        if($type == 2){
+            $dormitoryInfo = [
+                "livingTitle" => $livingInfo["title"],
+                "buildingTitle" => $buildingInfo["building_title"],
+                "floorTitle" => $floorInfo["floor_title"],
+                "dormitoryNumber" => $dormitory["dormitory_number"],
+                "bedNumber" => $bed["bed_number"],
+                "price" => $multipleInfo["price"]
+            ];
+            return $dormitoryInfo;
+        }
+
+        //拼接宿舍信息
+        $name = $dormitoryTypeInfo["dormitory"]."-".$multipleInfo["people"]."----".
+            $livingInfo["title"]."/".$buildingInfo["building_title"]."/".
+            $floorInfo["floor_title"]."/".$dormitory["dormitory_number"]."/".$bed["bed_number"];
+
+        return $name;
+    }
 }
diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php
index 5c700f0..8f778ff 100644
--- a/dcat_admin_ide_helper.php
+++ b/dcat_admin_ide_helper.php
@@ -73,6 +73,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection xslbdm
      * @property Grid\Column|Collection xydm
      * @property Grid\Column|Collection xz
+     * @property Grid\Column|Collection zero_enrol
      * @property Grid\Column|Collection zydm
      * @property Grid\Column|Collection bed_id
      * @property Grid\Column|Collection building_id
@@ -300,6 +301,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection xslbdm(string $label = null)
      * @method Grid\Column|Collection xydm(string $label = null)
      * @method Grid\Column|Collection xz(string $label = null)
+     * @method Grid\Column|Collection zero_enrol(string $label = null)
      * @method Grid\Column|Collection zydm(string $label = null)
      * @method Grid\Column|Collection bed_id(string $label = null)
      * @method Grid\Column|Collection building_id(string $label = null)
@@ -532,6 +534,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection xslbdm
      * @property Show\Field|Collection xydm
      * @property Show\Field|Collection xz
+     * @property Show\Field|Collection zero_enrol
      * @property Show\Field|Collection zydm
      * @property Show\Field|Collection bed_id
      * @property Show\Field|Collection building_id
@@ -759,6 +762,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection xslbdm(string $label = null)
      * @method Show\Field|Collection xydm(string $label = null)
      * @method Show\Field|Collection xz(string $label = null)
+     * @method Show\Field|Collection zero_enrol(string $label = null)
      * @method Show\Field|Collection zydm(string $label = null)
      * @method Show\Field|Collection bed_id(string $label = null)
      * @method Show\Field|Collection building_id(string $label = null)
diff --git a/resources/lang/zh_CN/admission-new-student.php b/resources/lang/zh_CN/admission-new-student.php
index ea0d01f..4b9b74a 100644
--- a/resources/lang/zh_CN/admission-new-student.php
+++ b/resources/lang/zh_CN/admission-new-student.php
@@ -24,6 +24,7 @@ return [
         'annual_session' => '学年',
         'student_info' => '详细信息',
         'is_push' => '是否推送',
+        'zero_enrol' => '0元入学'
     ],
     'options' => [
     ],
diff --git a/resources/lang/zh_CN/allocation-dormitory-bed.php b/resources/lang/zh_CN/allocation-dormitory-bed.php
index 66fa358..64e7037 100644
--- a/resources/lang/zh_CN/allocation-dormitory-bed.php
+++ b/resources/lang/zh_CN/allocation-dormitory-bed.php
@@ -19,6 +19,7 @@ return [
         'sex' => '性别',
         'secondary_college_id' => '二级学院',
         'is_select' => '是否被占用',
+        'zero_enrol' => '0元入学'
     ],
     'options' => [
     ],
diff --git a/resources/lang/zh_CN/minimum-limit-tuition.php b/resources/lang/zh_CN/minimum-limit-tuition.php
new file mode 100644
index 0000000..9b4843e
--- /dev/null
+++ b/resources/lang/zh_CN/minimum-limit-tuition.php
@@ -0,0 +1,16 @@
+<?php 
+return [
+    'labels' => [
+        'MinimumLimitTuition' => '最低缴费',
+        'minimum-limit-tuition' => '最低缴费',
+    ],
+    'fields' => [
+        'price' => '最低缴费',
+        'type' => '类型',
+        'status' => '状态',
+        'create_time' => '创建时间',
+        'update_time' => '修改时间',
+    ],
+    'options' => [
+    ],
+];