Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/base/entity/Company.java

@@ -66,4 +66,6 @@ public class Company {
     private String legalTel;
         @ApiModelProperty(value = "营业执照")
     private String businessLicenseUrl;
+    @ApiModelProperty(value = "logo")
+    private String logo;
 }

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

@@ -27,6 +27,7 @@
 			<result property="legalPerson" column="legal_person" />
 			<result property="legalTel" column="legal_tel" />
 			<result property="businessLicenseUrl" column="business_license_url" />
+			<result property="logo" column="logo_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.Company">
 	<!--
@@ -37,7 +38,7 @@
 	<![CDATA[
 		insert into base_company
 	    (id_,name_,type_,scale_,industry_,address_,introduction_,contact_person,tel_,longtitude_,latitude_,email_,sort_no,create_by,create_time,update_by,update_time,del_flag,is_certification,credit_code,legal_person,legal_tel,business_license
-_url)
+_url,logo_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -62,8 +63,8 @@ _url)
 ,#{creditCode,jdbcType=VARCHAR}
 ,#{legalPerson,jdbcType=VARCHAR}
 ,#{legalTel,jdbcType=VARCHAR}
-,#{businessLicense
-Url,jdbcType=VARCHAR}
+,#{businessLicenseUrl,jdbcType=VARCHAR}
+,#{logo,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -139,6 +140,9 @@ Url,jdbcType=VARCHAR}
 				<if test="businessLicenseUrl!=null">
 		business_license_url=#{businessLicenseUrl,jdbcType=VARCHAR},
 		</if>
+			<if test="logo!=null">
+				logo_=#{logo,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>