Merge branch 'sprint/244' into 'sprint/244_wangzemei_70009'

# Conflicts:
#   www/theme/blue/style.css
#   www/theme/green/style.css
This commit is contained in:
李玉春
2022-09-29 00:58:03 +00:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -60,7 +60,7 @@
<?php foreach($products as $product):?>
<tr class="text-center">
<?php $count = isset($product->plans) ? count($product->plans) : 1;?>
<td class='text-left' title="<?php echo $product->name;?>" rowspan="<?php echo $count;?>"><?php echo "<p>" . html::a($this->createLink('product', 'view', "product=$product->id"), $product->name) . "</p>";?></td>
<td class='c-name text-left' title="<?php echo $product->name;?>" rowspan="<?php echo $count;?>"><?php echo "<p>" . html::a($this->createLink('product', 'view', "product=$product->id"), $product->name) . "</p>";?></td>
<td class='text-left' rowspan="<?php echo $count;?>"><?php echo "<p>" . zget($users, $product->PO) . '</p>';?></td>
<?php if(isset($product->plans)):?>
<?php $id = 1;?>
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long