Merge branch 'uat_partyMemberEvent' into uat_code

src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventStyleMapper.xml

@@ -6,6 +6,7 @@
                type="com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventStyle">
             <result column="id"  jdbcType="BIGINT"  property="id"/>
             <result column="title"  jdbcType="VARCHAR" property="title"/>
+            <result column="secord_title"  jdbcType="VARCHAR" property="secordTitle"/>
             <result column="image_word"  jdbcType="VARCHAR" property="imageWord"/>
             <result column="title_image"  jdbcType="VARCHAR" property="titleImage"/>
             <result column="category"  jdbcType="VARCHAR" property="category"/>

src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java

@@ -37,6 +37,12 @@ public class EventStyle implements Serializable {
         @ApiModelProperty(value = "标题")
         private String title;
 
+        /**
+        * 二级标题
+        */
+        @ApiModelProperty(value = "二级标题")
+        private String secordTitle;
+
         /**
         * 图片文字
         */