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

nidapeng

2024-04-08 e01af6d359c42b57550957d0108bb23d14088cd0

 company/src/components/business/dispatchUnitDetailsPlat.vue

@@ -97,7 +97,7 @@
                                    </span>
                                </span>
                                <span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
                                    操作员-{{activity.creatorName}}（{{activity.creatorType==1? activity.companyName: "平台端"}}）{{activity.createDate}}
                                    操作员-{{activity.creatorName}}（{{(activity.creatorType == 1||activity.creatorType == 2)? activity.companyName: "平台端"}}）{{activity.createDate}}
                                </span>
                            </div>
                        </el-timeline-item>