Merge remote-tracking branch 'origin/master'

# Conflicts:
#	main/app/modbus_master.c
#	main/ui/generated/guider_fonts/lv_font_Alibaba_PuHuiTi_Medium_20.c
#	main/ui/generated/setup_scr_FactorySettingPage.c
#	main/ui/generated/setup_scr_screen_main.c
#	xfUI/XFJS/XFJS.guiguider
#	xfUI/XFJS/generated/gui_guider.h
#	xfUI/XFJS/generated/images/images_list.mk

xfUI/XFJS/generated/guider_fonts/fonts_list.mk

@@ -1 +1 @@
-GEN_CSRCS += lv_font_Alibaba_PuHuiTi_Medium_26.c lv_font_montserratMedium_16.c lv_font_Alibaba_PuHuiTi_Medium_16.c lv_font_iconfont_24.c lv_font_Alibaba_PuHuiTi_Medium_18.c lv_font_Alibaba_PuHuiTi_Medium_48.c lv_font_Alibaba_PuHuiTi_Medium_14.c lv_font_Alibaba_PuHuiTi_Medium_22.c lv_font_montserratMedium_12.c lv_font_Alibaba_PuHuiTi_Medium_12.c lv_font_iconfont_22.c lv_font_iconfont_16.c lv_font_Alibaba_PuHuiTi_Medium_20.c lv_font_SourceHanSerifSC_Regular_18.c
+GEN_CSRCS += lv_font_Alibaba_PuHuiTi_Medium_18.c lv_font_montserratMedium_16.c lv_font_Alibaba_PuHuiTi_Medium_48.c lv_font_Alibaba_PuHuiTi_Medium_14.c lv_font_Alibaba_PuHuiTi_Medium_22.c lv_font_montserratMedium_12.c lv_font_Alibaba_PuHuiTi_Medium_12.c lv_font_iconfont_22.c lv_font_iconfont_16.c lv_font_Alibaba_PuHuiTi_Medium_26.c lv_font_iconfont_24.c lv_font_Alibaba_PuHuiTi_Medium_16.c lv_font_Alibaba_PuHuiTi_Medium_20.c lv_font_SourceHanSerifSC_Regular_18.c