Merge remote-tracking branch 'origin/master'

# Conflicts:
#	picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsurancePolicyUserController.java

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

@@ -94,8 +94,11 @@ id_,jobs_id,definition_id,charges_,del_flag,create_by,create_time,update_by,upda
 		]]>
 		<where>
 			and del_flag = false
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.jobsId != null">
+				and jobs_id like #{searchParams.jobsId}
+			</if>
+			<if test="searchParams.definitionId != null">
+				and definition_id like #{searchParams.definitionId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">