linwei
2023-12-29 f6332b2e13e9cee67ee30646063e38c403554f89
Merge remote-tracking branch 'origin/master'
2 files modified
17 ■■■■ changed files
src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java 14 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -133,20 +133,10 @@
    @ApiModelProperty(value = "户籍类型 业务字典:residentType")
    private Integer residentType;
    /**
     * 户籍地址
     * 户籍登记地(户籍地址)
     */
    @ApiModelProperty(value = "户籍地址")
    private String residentAddr;
    /**
     * 户籍登记地
     */
    @ApiModelProperty(value = "户籍登记地")
    @ApiModelProperty(value = "户籍登记地(户籍地址)")
    private String hukouRegistration;
    /**
     * 户籍地址编码
     */
    @ApiModelProperty(value = "户籍地址编码")
    private String residentAddrNo;
    /**
     * 户籍地行政区划
     */
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -73,6 +73,9 @@
        <if test="place.id!=null">
            and jp.id = #{place.id}
        </if>
        <if test="place.source!=null">
            and jp.source = #{place.source}
        </if>
        <if test="place.isPerfect==1">
            and
            (