Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

ali

2025-03-06 10e83311f7457f07b3d0928fba0de6a5622f1748

 zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java

@@ -44,10 +44,13 @@
    /**
     * 节点id
     */
    @NotBlank(message = "节点id不能为空")
    @ApiModelProperty(value = "节点id")
    private String nodeId;

    @NotBlank(message = "模型编码不能为空")
    @ApiModelProperty(value = "模型编码")
    private String modelCode;

    public TimeType getTimeType() {
        if (ObjectUtils.isEmpty(timeType)) {
            return TimeType.DAY;