From 641ddf669ad57fb544e13a6433aa5905551b3bba Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期三, 22 九月 2021 09:04:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project

---
 CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx
index 673c968..211497e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx
@@ -75,6 +75,7 @@
                 </td>
                 <td align="center">
                     <input type="text"  id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
+                    <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                 </td>
             </tr>
         </tbody>

--
Gitblit v1.9.1