用户和企业添加字段

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/CompanyInfo.java

@@ -39,7 +39,7 @@ public class CompanyInfo {
     private String scaleN;
     @ApiModelProperty(value = "所属行业（1：计算机/IT，2：食品加工，3：服务业）")
     private String industry;
-    @ApiModelProperty(value = "字典：所属行业")
+    @ApiModelProperty(value = "所属行业翻译")
     private String industryName;
     @ApiModelProperty(value = "所在地区（1：荆州区，2：沙市区，3：开发区，4：石首市）")
     private String region;
@@ -63,4 +63,8 @@ public class CompanyInfo {
     private Date updateTime;
     @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
+    @ApiModelProperty(value = "企联职务（数据字典:气帘职务）")
+    private String position;
+    @ApiModelProperty(value = "企联职务（数据字典:气帘职务）翻译")
+    private String positionName;
 }

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/PersonInfo.java

@@ -60,4 +60,8 @@ public class PersonInfo {
 
     @ApiModelProperty(value = "企业名称")
     private String companyName;
+    @ApiModelProperty(value = "用户头衔（数据字典:用户头衔）")
+    private String title;
+    @ApiModelProperty(value = "用户头衔翻译")
+    private String titleName;
 }

common/src/main/resources/mapper/base/CompanyInfo.xml

@@ -22,6 +22,7 @@
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
 			<result property="industryName" column="industry_name" />
+			<result property="position" column="position_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.enterprise.modules.base.entity.CompanyInfo">
 	<!--
@@ -31,7 +32,7 @@
 	-->
 	<![CDATA[
 		insert into base_company_info
-	    (id_,company_name,type_,logo_url,credit_code,address_,business_license_url,scale_,industry_,region_,company_introduction,enterpriser_introduction,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,company_name,type_,logo_url,credit_code,address_,business_license_url,scale_,industry_,region_,company_introduction,enterpriser_introduction,create_by,create_time,update_by,update_time,del_flag,position_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -51,6 +52,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{position,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -108,6 +110,9 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="position!=null">
+				position_=#{position,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/src/main/resources/mapper/base/PersonInfo.xml

@@ -23,6 +23,7 @@
 			<result property="remark" column="remark_" />
 			<result property="registerTypeName" column="register_type_name"/>
 			<result property="companyName" column="company_name"/>
+			<result property="title" column="title_"/>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.enterprise.modules.base.entity.PersonInfo">
 	<!--
@@ -32,7 +33,7 @@
 	-->
 	<![CDATA[
 		insert into base_person_info
-	    (id_,person_name,user_name,password_,open_id,id_card,face_image_url,company_id,register_type,phone_,id_card_url,create_by,create_time,update_by,update_time,del_flag,remark_)
+	    (id_,person_name,user_name,password_,open_id,id_card,face_image_url,company_id,register_type,phone_,id_card_url,create_by,create_time,update_by,update_time,del_flag,remark_,title_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -52,6 +53,7 @@
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{remark,jdbcType=VARCHAR}
+,#{title,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -109,6 +111,9 @@
 				<if test="remark!=null">
 		remark_=#{remark,jdbcType=VARCHAR},
 		</if>
+			<if test="title!=null">
+				title_=#{title,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>