Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/admin/controller/JwtsUserController.java

@@ -305,7 +305,7 @@ public class JwtsUserController {
                 }
             }
             else{
-                message = "您已注册!请在电脑端登录荆州人才超市联盟平台（http://www.jzrccs.com）完成投保申请。";
+                message = "您已注册!请在电脑端登录荆州人才超市联盟平台（http://picc.jzrccs.com）完成投保申请。";
             }
         }
         catch (Exception ex){

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

@@ -59,8 +59,8 @@
 		(
 			#{id,jdbcType=VARCHAR}
 			,#{name,jdbcType=VARCHAR}
-			,#{legalPhone,jdbcType=VARCHAR}
 			,#{legalName,jdbcType=VARCHAR}
+			,#{legalPhone,jdbcType=VARCHAR}
 			,#{legalCard,jdbcType=VARCHAR}
 			,#{legalCardFile,jdbcType=VARCHAR}
 			,#{usccCode,jdbcType=VARCHAR}

picc-common/src/main/resources/mapper/base/InsuranceDefinition.xml

@@ -79,6 +79,9 @@
 			<if test="cutOffTime!=null">
 				cut_off_time=#{cutOffTime,jdbcType= VARCHAR },
 			</if>
+			<if test="notice!=null">
+				notice_=#{notice,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

picc-common/src/main/resources/mapper/business/InsurancePolicy.xml

@@ -283,7 +283,8 @@
     <select id="mySearch" parameterType="hashmap" resultMap="InsurancePolicyMap">
         <![CDATA[
 			SELECT a.id_,a.policy_no,b.name_ AS definition_name,a.number_,a.start_time,
-			a.end_time,a.create_time,a.finish_time,a.insurance_fee,a.status_
+			a.end_time,a.create_time,a.finish_time,a.insurance_fee,a.status_,
+			a.insurance_policy_file
 			FROM business_insurance_policy a
             LEFT JOIN base_insurance_definition b ON a.definition_id = b.id_
 		]]>

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/dto/CompanyInfoDTO.java

@@ -37,4 +37,6 @@ public class CompanyInfoDTO {
     private String industryType;
     @ApiModelProperty(value = "地址")
     private String address;
+    @ApiModelProperty(value = "邮政编号")
+    private String postal;
 }