Merge branch '新疆警官学校中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 新疆警官学校中职

# Conflicts:
#	Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Leavebyday/single.vue

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Leavebyday/single.vue

@@ -6,8 +6,8 @@
 		<l-input :value="formData.Code" title="编号" disabled/>
 		<l-input :value="formData.DistrictTeam" title="区队" disabled/>
 		<l-select v-model="formData.IsCampus" :range="dataSource.IsCampus" title="校内/外出" disabled/>
-		<!-- <l-select v-show="formData.IsCampus == '1'"
-			v-model="formData.IsStay" :range="dataSource.IsStay" title="过夜" disabled/> -->
+		<l-select v-show="formData.IsCampus == '1'"
+			v-model="formData.IsStay" :range="dataSource.IsStay" title="过夜" disabled/>
 	  <l-input v-model="formData.CreateUserNo" title="学号" disabled></l-input>
 	  <l-input v-model="formData.CreateUserName"  title="姓名" disabled></l-input>
 	  <!-- <l-select v-model="formData.CreateUserNo" :range="dataSource.ApplyUser" title="学生" disabled></l-select> -->