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

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

@@ -224,6 +224,8 @@ public class FilmController {
 		@ApiImplicitParam(paramType="query", dataType="string", name="director_biography_en", value="导演英文简介"),
 		@ApiImplicitParam(paramType="query", dataType="string", name="producer_cn", value="制片人中文名"),
 		@ApiImplicitParam(paramType="query", dataType="string", name="producer_en", value="制片人英文名"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="production_cn", value="制片公司中文"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="production_en", value="制片公司英文"),
 		@ApiImplicitParam(paramType="query", dataType="string", name="format", value="放映格式"),
 		@ApiImplicitParam(paramType="query", dataType="string", name="screenplay", value="编剧"),
 		@ApiImplicitParam(paramType="query", dataType="string", name="director_of_photography", value="摄影指导"),

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

@@ -39,6 +39,12 @@ public class Fc_member_film_ext implements java.io.Serializable {
 	@Column(columnDefinition="varchar(255) COMMENT '制片人英文名'")
 	private String producer_en;
 
+	@Column(columnDefinition="varchar(255) COMMENT '制片公司中文'")
+	private String production_cn;
+
+	@Column(columnDefinition="varchar(255) COMMENT '制片公司英文'")
+	private String production_en;
+
 	@Column(columnDefinition="varchar(255) COMMENT '放映格式'")
 	private String format;
 
@@ -160,6 +166,22 @@ public class Fc_member_film_ext implements java.io.Serializable {
 		return producer_en;
 	}
 
+	public void setProduction_cn(String production_cn) {
+		this.production_cn = production_cn;
+	}
+
+	public String getProduction_cn() {
+		return production_cn;
+	}
+
+	public void setProduction_en(String production_en) {
+		this.production_en = production_en;
+	}
+
+	public String getProduction_en() {
+		return production_en;
+	}
+
 	public void setFormat(String format) {
 		this.format = format;
 	}