Merge remote-tracking branch 'origin/master'

BusinessSetting/src/main/java/com/develop/setting/ui/AboutActivity.kt

@@ -125,7 +125,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         binding.tvFirmware.text = Build.DISPLAY
 
-//        binding.model.text = getSN().substring(4, 8)
+        binding.model.text = getSN().substring(4, 8)
 
         recipeUpdateDialog.onDialogClickListener =
             object : RecipeUpdateDialog.OnDialogClickListener {

BusinessStep/src/main/res/layout/activity_cook_step_base.xml

@@ -296,7 +296,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/convert_24px"
-                    android:text="Add to favourite"
+                    android:text="@string/add_to_favourite"
                     android:textColor="@color/white"
                     android:textSize="@dimen/convert_30px" />