Merge branch 'master' into dev

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityTemporary.java

@@ -24,8 +24,6 @@ public class ActivityTemporary {
     @Id
     @KeySql(dialect = IdentityDialect.MYSQL)
     private Integer id;
-    @Column(name = "activity_id")
-    private Integer activityId;
     private String name;
     private String phone;
     private Integer inviter;

xx-summit/xx-summit-server/src/main/resources/mapper/ActivityTemporaryMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.xxfc.platform.summit.mapper.ActivityTemporaryMapper">
     <insert id="addModifyIfPresent" parameterType="com.xxfc.platform.summit.entity.ActivityTemporary"
             useGeneratedKeys="true" keyProperty="id" keyColumn="id">
-    INSERT INTO fc_activity_temporary (activity_id,name,phone,inviter,crt_time,upd_time)
-    VALUES (#{activityId},#{name},#{phone},#{inviter},#{crtTime},#{updTime}) ON DUPLICATE KEY UPDATE upd_time = VALUES(crt_time)
+    INSERT INTO fc_activity_temporary (name,phone,inviter,crt_time,upd_time)
+    VALUES (#{name},#{phone},#{inviter},#{crtTime},#{updTime}) ON DUPLICATE KEY UPDATE upd_time = VALUES(crt_time)
    </insert>
 </mapper>
\ No newline at end of file