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

lihongji

2024-11-28 e8e4aac007c3d1356813e4568a148cf46bbff458

 _Main/UI/MacroPlannerWebApp/Component_StandardHoursReport/Response_pOperaction_cbComprehensiveHours_OnUserChanged.def

@@ -12,9 +12,9 @@
    [*
      cbStandardHours.Checked( not this.Checked() );
      if( this.Checked() ){
        PackagingPlanLotSizeDialog.Title( "综合工时制报表" );
        FormComprehensiveStandardHoursReport.Title( "综合工时制报表" );
      }else{
        PackagingPlanLotSizeDialog.Title( "标准工时制报表" );
        FormComprehensiveStandardHoursReport.Title( "标准工时制报表" );
      }
    *]
  }