Merge branch 'local_20221115' into haucheng_panzhihua

yanghui

2022-12-01 95b0a91196bc54d5974fed544324c3f0c0ee8f6a

Merge branch 'local_20221115' into haucheng_panzhihua

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

@@ -1043,7 +1043,7 @@
    public R orderAndSolve(EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
        ComActNeighborCircleDO comActNeighborCircleDO=new ComActNeighborCircleDO();
        BeanUtils.copyProperties(editNeighborCircleAdminVO,comActNeighborCircleDO);
        if(comActNeighborCircleDO.getSolveStatus()!=null){
        if(comActNeighborCircleDO.getSolveStatus()!=null&&comActNeighborCircleDO.getSolveStatus()==3){
            comActNeighborCircleDO.setSolveTime(new Date());
        }
        if(comActNeighborCircleDO.getOrderStatus()!=null){