# Conflicts:
#	app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
#	app/src/main/java/com/bonait/bnframework/business/MainInit.java
#	app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
#	app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DzcjyActivity.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java

2.调整新建配方根据做法自动生成名称
3.自动补水增加关闭时自动延迟