冲突导致代码丢失

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousServiceImpl.java

@@ -730,9 +730,11 @@ public class WbsSynchronousServiceImpl {
                                                         if (submit == 1 && contractRanges.contains(WbsSyncTypeEnum.PENDING_APPROVAL.code)) {
                                                             //待审批 104
                                                             isSync = true;
+                                                            isOldHtml = true;
                                                         } else if (submit == 2 && contractRanges.contains(WbsSyncTypeEnum.APPROVED.code)) {
                                                             //已审批 105
                                                             isSync = true;
+                                                            isOldHtml = true;
                                                         }
                                                     }
                                                 }