修复点击编辑时 定价页面不能正常显示的bug，修复点击库存时，库存设置页面不能正常显示定价时间的bug

src/main/java/com/ctrip/fun/admin/controller/golf/CourseResourceController.java

@@ -441,13 +441,16 @@ public class CourseResourceController {
         if (null != priceId) {
             ResourcePriceBean bean = service.getPrice("", priceId);
             BeanConverter.copyProperties(form, bean);
-            Date[] theDate = new Date[1];
-            theDate[0]=bean.getPriceDate();
-            form.setTheDate(theDate);
+//            Date[] theDate = new Date[1];
+//            theDate[0]=bean.getPriceDate();
+//            form.setTheDate(theDate);
+            model.put("theDate", bean.getPriceDate());
         }
+        
 
         CourseResourceBean bean = service.get("", resourceId);
         int paymentType = bean.getPaymentType();
+        model.put("form", form);
         model.put("paymentType", paymentType);
         model.put("id", priceId);
         model.put("action", "/golf/course-resource/price/edit");
@@ -478,7 +481,8 @@ public class CourseResourceController {
             ResourceInventoryBean bean = service.getInventory("", inventoryId);
             BeanConverter.copyProperties(form, bean);
             
-            form.setTheDate(bean.getTheDate());
+//            form.setTheDate(bean.getTheDate());
+            model.put("theDate", bean.getTheDate()[0]);
             
         }
 

src/main/webapp/WEB-INF/templates/golf/resourceInventoryForm.ftl

@@ -55,8 +55,17 @@
 				<div class="long_content_div control-group ">
 				    <label class="control-label" for="theDate">时间</label>
 				    <div class="controls" style="">
-				      <input id="theDate" name="theDate" value="" placeholder="时间"  class="datepicker input-medium" required="" type="text" />
+				      <#if id??>
+				      <input id="theDate" name="theDate" value='${(theDate?string("yyyy-MM-dd"))!}'   placeholder="时间" title="时间"  class="datepicker input-medium" required="" type="text" />
 				      <div class="pp" style="background-image:url(${staticServer}/pic/calendar.jpg);width: 40px;height: 30px;">  
+				      <#else>
+				      <input id="theDate" name="theDate"  value='' placeholder="时间"  title="时间" class="datepicker input-medium" required="" type="text" />
+				      <div class="pp" style="background-image:url(${staticServer}/pic/calendar.jpg);width: 40px;height: 30px;">  
+				      </#if>
+				      
+				      <!--
+				      <input id="theDate" name="theDate" value="${(theDate?string("yyyy-MM-dd"))!}" placeholder="时间"  class="datepicker input-medium" required="" type="text" />
+				      <div class="pp" style="background-image:url(${staticServer}/pic/calendar.jpg);width: 40px;height: 30px;">    -->
 				      </div>
 				    </div>
 				</div>

src/main/webapp/WEB-INF/templates/golf/resourcePriceForm.ftl

@@ -82,10 +82,11 @@ $(function () {
 				    <label class="control-label" for="theDate">时间</label>
 				    <div class="controls" style="">
 				      <#if id??>
-				      <input id="theDate" name="theDate" value="" placeholder="时间"  class="datepicker input-medium" required="" type="text" />
+				      <input id="theDate" name="theDate" value='${(theDate?string("yyyy-MM-dd"))!}'   placeholder="时间" title="时间"  class="datepicker input-medium" required="" type="text" />
 				      <div class="pp" style="background-image:url(${staticServer}/pic/calendar.jpg);width: 40px;height: 30px;">  
 				      <#else>
-				      <input id="theDate" name="theDate" value="${form.theDate??}" placeholder="时间"  class="datepicker input-medium" required="" type="text" />
+				      <input id="theDate" name="theDate"  value='' placeholder="时间"  title="时间" class="datepicker input-medium" required="" type="text" />
+				      <div class="pp" style="background-image:url(${staticServer}/pic/calendar.jpg);width: 40px;height: 30px;">  
 				      </#if>
 				      
 				      </div>