patch两个pr

修复BaseStyleSettingPane中的bug，成员变量没初始化

designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java

@@ -66,8 +66,8 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
     // 按钮背景设置
     protected ButtonStyleDefinedPane buttonStyleDefinedPane;
 
-    private Map<StyleSetting, UILabel> labelMap;
-    private Map<StyleSetting, Component> paneMap;
+    private final Map<StyleSetting, UILabel> labelMap = new HashMap<>();
+    private final Map<StyleSetting, Component> paneMap = new HashMap<>();
     public BaseStyleSettingPane(List<StyleSetting> styleSettingList) {
         this.styleSettingList = styleSettingList;