Merge branch 'master' of https://git.zcorp.cc/zentaopms

module/block/view/programblock.html.php

@@ -9,8 +9,8 @@
   <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-programs <?php if(!$longBlock) echo 'block-sm';?>'>
     <thead>
       <tr>
-        <th class='c-name'><?php echo $lang->program->PRJName;?></th>
-        <th class='w-100px'> <?php echo $lang->program->PGMPM;?></th>
+        <th class='c-name w-100px'><?php echo $lang->program->PRJName;?></th>
+        <th class='w-100px'><?php echo $lang->program->PGMPM;?></th>
         <th class='w-80px'><?php echo $lang->program->PGMStatus;?></th>
         <?php if($longBlock):?>
         <th class='w-80px'><?php echo $lang->program->teamCount;?></th>

module/custom/view/estimate.html.php

@@ -94,7 +94,7 @@ $lang->custom->system[] = 'estimate';
         </tr>
         <tr>
           <td colspan='2' class='text-center'>
-            <?php echo html::hidden('scaleFactor', '')?>
+            <?php echo html::hidden('scaleFactor', '');?>
             <?php echo html::submitButton();?>
             <div class='text-red' id='saveTips'></div>
           </td>