Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-10 95668edbe2d05516c7b91ebb7bba02f715328b78

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java

@@ -132,4 +132,7 @@
    private String categoryName;
    @ApiModelProperty("当前调解部门")
    private String currentOrgName;
    @ApiModelProperty("用户取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date revokeDate;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoIndustryCenterDao.xml

@@ -38,9 +38,11 @@
        select id,name from com_sanshuo_industry_center where status=1 and del_flag=1
    </select>
    <select id="streetList" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertRangeVO">
        select street_id as id,name from com_street
        select street_id as id,name from com_street where app_id='wx0cef797390444b75'
    </select>
    <select id="communityList" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertRangeVO">
        select community_id as id,name from com_act
        where app_id='wx0cef797390444b75'
    </select>

</mapper>