Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-09-29 20bc7297cb7c02851115a41d633d252334a3e202

 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -98,10 +98,7 @@
            return ResultData.error("导办人员id不能为空");
        }

        if(StringUtils.isEmpty(order.getGuideUserPhone()))
        {
            return ResultData.error("导办人员电话不能为空");
        }


        //已分配
        order.setState("2");
@@ -145,11 +142,6 @@
        if(StringUtils.isEmpty(order.getGuideUserId()))
        {
            return ResultData.error("导办人员id不能为空");
        }

        if(StringUtils.isEmpty(order.getGuideUserPhone()))
        {
            return ResultData.error("导办人员电话不能为空");
        }

        //已分配
@@ -339,7 +331,6 @@
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName);
        int num=iGuideRepairOrderService.countConfigList(matterName);
        return getDataTable(list,num);

    }