Merge branch 'local_20221115' into local_20221104

yanghui

2022-12-01 7d86f9b67effacfcb845ef1277eee3c978139079

Merge branch 'local_20221115' into local_20221104

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java

@@ -137,8 +137,8 @@
     * @return 单条数据
     */
    @ApiOperation("详情接口")
    @GetMapping("desensitize/{id}")
    public R selectOneDesensitize(@PathVariable("id") Long id) {
    @PostMapping("desensitize")
    public R selectOneDesensitize(Long id) {
        return this.propertyService.comPropertyRepairSelectOneDesensitize(id);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComPropertyApi.java

@@ -67,4 +67,6 @@
        return communityService.noticeList(page,size,propertyId);
    }



}

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

@@ -118,7 +118,7 @@
    int expertSolveCountCommunity();

    /**
     * 行业分中心专家受理数量
     * 行业分中心专家受理数量计算
     * */
    int expertSolveCountCenter();


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

@@ -301,8 +301,7 @@
        (SELECT count(id) FROM com_sanshuo_event_info
        where is_end <> 1
        AND user_event_status not in(3,4)
        AND event_process_status > 1
        AND event_process_status not in (9)
        AND event_process_status not in (1,9)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type in (1,5)