# Conflicts:
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingSimulatedActivity.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/systeminternetfragment.java

# Conflicts:
#	app/src/main/java/com/bonait/bnframework/business/UpDataModel.java
#	app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigation2Activity.java

2.手动等待时，暂停倒计时
3.臭鼬时间增加

2.手动等待时，暂停倒计时

2.手动等待时，暂停倒计时