Merge branch 'master' of http://gitlab.egolm.com/hanxu/siff-film-api.git

src/main/java/com/egolm/film/api/web/FilmController.java

@@ -232,8 +232,8 @@ public class FilmController {
 		@ApiImplicitParam(paramType="query", dataType="string", name="sound_format", value="音频"),
 		@ApiImplicitParam(paramType="query", dataType="string", name="frame_rate", value="帧数"),
 		@ApiImplicitParam(paramType="query", dataType="string", name="kdm", value="密钥"),
-		@ApiImplicitParam(paramType="query", dataType="string", name="director_photo", value="导演照片"),
-		@ApiImplicitParam(paramType="query", dataType="string", name="mv_photo", value="剧照"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="photo_director", value="导演照片"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="photo_mv", value="剧照"),
 	})
 	public Object update_base(Fc_member_film_ext filmExt) {
 		filmService.saveOrUpdateFilmExt(filmExt);

src/main/java/com/egolm/film/bean/Fc_member_film_ext.java

 package com.egolm.film.bean;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
 
-import io.swagger.annotations.ApiModelProperty;
+import javax.persistence.Column;
+
+import javax.persistence.Id;
 
 @Entity(name="fc_member_film_ext")
 public class Fc_member_film_ext implements java.io.Serializable {
@@ -11,80 +12,80 @@ public class Fc_member_film_ext implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@ApiModelProperty(value="int(11) COMMENT '影片ID'")
+	@Column(columnDefinition="int(11) COMMENT '影片ID'")
 	private Integer id;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '影片简介中文'")
+	@Column(columnDefinition="varchar(255) COMMENT '影片简介中文'")
 	private String synopsis_cn;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '影片简介英文'")
+	@Column(columnDefinition="varchar(255) COMMENT '影片简介英文'")
 	private String synopsis_en;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '导演中文名'")
+	@Column(columnDefinition="varchar(255) COMMENT '导演中文名'")
 	private String director_cn;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '导演英文名'")
+	@Column(columnDefinition="varchar(255) COMMENT '导演英文名'")
 	private String director_en;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '导演中文简介'")
+	@Column(columnDefinition="varchar(255) COMMENT '导演中文简介'")
 	private String director_biography_cn;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '导演英文简介'")
+	@Column(columnDefinition="varchar(255) COMMENT '导演英文简介'")
 	private String director_biography_en;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '制片人中文名'")
+	@Column(columnDefinition="varchar(255) COMMENT '制片人中文名'")
 	private String producer_cn;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '制片人英文名'")
+	@Column(columnDefinition="varchar(255) COMMENT '制片人英文名'")
 	private String producer_en;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '放映格式'")
+	@Column(columnDefinition="varchar(255) COMMENT '放映格式'")
 	private String format;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '编剧'")
+	@Column(columnDefinition="varchar(255) COMMENT '编剧'")
 	private String screenplay;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '摄影指导'")
+	@Column(columnDefinition="varchar(255) COMMENT '摄影指导'")
 	private String director_of_photography;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '音乐'")
+	@Column(columnDefinition="varchar(255) COMMENT '音乐'")
 	private String music;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '艺术指导'")
+	@Column(columnDefinition="varchar(255) COMMENT '艺术指导'")
 	private String production_designer;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '执行制片人'")
+	@Column(columnDefinition="varchar(255) COMMENT '执行制片人'")
 	private String executive_producer;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '剪辑'")
+	@Column(columnDefinition="varchar(255) COMMENT '剪辑'")
 	private String editor;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '主要演员制片人'")
+	@Column(columnDefinition="varchar(255) COMMENT '主要演员制片人'")
 	private String cast;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '国际销售'")
+	@Column(columnDefinition="varchar(255) COMMENT '国际销售'")
 	private String world_sales;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '分辨率'")
+	@Column(columnDefinition="varchar(255) COMMENT '分辨率'")
 	private String resolution;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '画幅'")
+	@Column(columnDefinition="varchar(255) COMMENT '画幅'")
 	private String aspect_ratio;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '音频'")
+	@Column(columnDefinition="varchar(255) COMMENT '音频'")
 	private String sound_format;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '帧数'")
+	@Column(columnDefinition="varchar(255) COMMENT '帧数'")
 	private String frame_rate;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '密钥'")
+	@Column(columnDefinition="varchar(255) COMMENT '密钥'")
 	private String kdm;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '导演照片'")
-	private String director_photo;
+	@Column(columnDefinition="varchar(255) COMMENT '导演照片'")
+	private String photo_director;
 
-	@ApiModelProperty(value="varchar(255) COMMENT '剧照'")
-	private String mv_photo;
+	@Column(columnDefinition="varchar(255) COMMENT '剧照'")
+	private String photo_mv;
 
 
 	public void setId(Integer id) {
@@ -271,20 +272,20 @@ public class Fc_member_film_ext implements java.io.Serializable {
 		return kdm;
 	}
 
-	public void setDirector_photo(String director_photo) {
-		this.director_photo = director_photo;
+	public void setPhoto_director(String photo_director) {
+		this.photo_director = photo_director;
 	}
 
-	public String getDirector_photo() {
-		return director_photo;
+	public String getPhoto_director() {
+		return photo_director;
 	}
 
-	public void setMv_photo(String mv_photo) {
-		this.mv_photo = mv_photo;
+	public void setPhoto_mv(String photo_mv) {
+		this.photo_mv = photo_mv;
 	}
 
-	public String getMv_photo() {
-		return mv_photo;
+	public String getPhoto_mv() {
+		return photo_mv;
 	}
 
 }