Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-housekeep-hall

# Conflicts:
#	pages/timing/autoOff.vue
覆盖

pages/timing/autoOff.vue

@@ -254,7 +254,11 @@
 		<ujpPicker mode="time" jp="2" :default-time="endTime?'2024-1-1 '+endTime+':1':''"  :defaultStartTime="startTime"
 		 v-model="pickerShow2" :params="params" @confirm="pickerShow2confirm" ></ujpPicker>
 		<!-- 自定义重复 -->
+<<<<<<< HEAD
 		<ujpPicker2   :texts="['开启“智能停电”','停止“智能停电”']"
+=======
+	<ujpPicker2   :texts="['开启"智能停电"','停止"智能停电"']"
+>>>>>>> e73dcc9d2155f78c3385e274ba0b15e23f531c38
 		:defaultTime="startTime?'2024-1-1 '+startTime+':1':''"
 		:defaultTime2="endTime?'2024-1-1 '+endTime+':1':''"