Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 ec8d6cd39a6fd612c98636c9e4ff262263de424a

Merge branch 'local_20221104' into huacheng_test

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

@@ -1049,7 +1049,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){