Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-10-27 2148e9e1f40388ec2710e54f634906378ded1a33

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -247,8 +247,8 @@
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("5");
        entity.setDepartmentalId(sysUser.getDepartmentId());
        entity.setToUserId(sysUser.getUserId()+"");
        entity.setFromDepartmentalId(sysUser.getDepartmentId());
        entity.setFromUserId(sysUser.getUserId()+"");
        entity.setGuideId(order.getId().toString());
        iGuideEvolveService.insertConfig(entity);
        return toAjax(iGuideRepairOrderService.updateConfig(order));