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

nidapeng

2024-04-01 bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4

 company/src/components/business/OperaApplyChangeDetailWindow.vue

@@ -171,7 +171,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.companyName: (activity.creatorType==2? activity.companyName: "平台端") }}}）{{activity.createDate}}
                                </span>
                      </div>
                    </el-timeline-item>