Merge remote-tracking branch 'origin/master'

CeDo

2021-04-16 76ae4e2bc4eeca9113da075416dc482b1be49f83

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -806,7 +806,7 @@
        List<String> head5 = new ArrayList<String>();
        head5.add("与户主关系");
        List<String> head6 = new ArrayList<String>();
        head6.add("街道");
        head6.add("街/路/巷");
        List<String> head7 = new ArrayList<String>();
        head7.add("小区号（政府对于每个小区都有特定编号）");
        List<String> head8 = new ArrayList<String>();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -94,7 +94,7 @@
    List<ComMngFamilyInfoVO> listFamilyByUserId(Long userId);

    @Select("select id,`name`,phone,relation from com_mng_population where road = #{comMngPopulationDO.road} and door_no = #{comMngPopulationDO.doorNo} and floor = #{comMngPopulationDO.floor} and unit_no = #{comMngPopulationDO.unitNo} and house_no = #{comMngPopulationDO.houseNo} and id != #{comMngPopulationDO.id}")
    List<ComHouseMemberVo> listHouseMermberByUserId(ComMngPopulationDO comMngPopulationDO);
    List<ComHouseMemberVo> listHouseMermberByUserId(@Param("comMngPopulationDO") ComMngPopulationDO comMngPopulationDO);

    @Select("<script> " +
            "SELECT\n" +

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

@@ -113,6 +113,11 @@
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 管理后台用户id
     */
    private Long sysUserId;

    @Override
    public String toString() {
        return "ComShopStoreDO{" +