Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java

@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
@@ -75,9 +75,9 @@
    private String photo;

    /**
     * 户籍性质（1.城镇户口 2.农村户口）
     * 户籍性质
     */
    private Integer regiterNature;
    private String regiterNature;

    /**
     * 入伍时间