java/zhihuishenqu.git

			@@ -83,7 +83,7 @@
			" END AS sex, " +
			" t.phone, " +
			" YEAR ( now( ) ) - YEAR ( substring( t.id_card, 7, 8 ) ) age, " +
			" t1.area_name, " +
			" t1.area_name as areaName, " +
			" t.political_outlook politicalOutlook, " +
			" CONCAT( " +
			" IF " +
			@@ -108,8 +108,8 @@
			"<if test='pageInputUserDTO.phone != null and pageInputUserDTO.phone.trim() != ""'>" +
			" and t.phone like concat(#{pageInputUserDTO.phone},'%') " +
			" </if> " +
			"<if test='pageInputUserDTO.areaId != null and pageInputUserDTO.areaId.trim() != ""'>" +
			" and t.area_id = #{pageInputUserDTO.areaId} " +
			"<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName.trim() != ""'>" +
			"AND t1.`area_name` like concat(#{pageInputUserDTO.areaName},'%') " +
			" </if> " +
			" group by t.id_card "+
			"</script>")
			@@ -153,7 +153,7 @@
			" END AS sex, " +
			" t.phone, " +
			" YEAR ( now( ) ) - YEAR ( substring( t.id_card, 7, 8 ) ) age, " +
			" t1.area_name, " +
			" t1.area_name as areaName, " +
			" t.political_outlook politicalOutlook, " +
			" CONCAT( " +
			" IF " +
			@@ -181,7 +181,7 @@
			" and t.phone like concat(#{pageInputUserDTO.phone},'%') " +
			" </if> " +
			"<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName.trim() != ""'>" +
			"AND t.`area_name` like concat(#{pageInputUserDTO.areaName},'%') " +
			"AND t1.`area_name` like concat(#{pageInputUserDTO.areaName},'%') " +
			" </if> " +
			"<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags.trim() != ""'>" +
			" and t.tags like concat('%',#{pageInputUserDTO.tags},'%') " +

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -95,6 +95,9 @@
			@ApiModelProperty("小区id")
			private Long areaId;

			@ApiModelProperty("小区名称")
			private String areaName;

			@ApiModelProperty("创建时间")
			@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
			private Date createAt;