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

lidongdong

2022-10-21 a6c7ae8b7578135f1be4ab58e8cc0d49c86529ec

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

@@ -180,7 +180,6 @@
        entity.setFromUserId(sysUser.getUserId()+"");
        entity.setFromDepartmentalId(sysUser.getDepartmentId());
        entity.setGuideId(order.getId().toString());
        order=iGuideRepairOrderService.setTimeoutTim(order);

        iGuideEvolveService.insertConfig(entity);
        iGuideRepairOrderService.updateSysUserOrderNum(entity);