Merge branch 'f-6.6.7' of 192.168.10.6:caosy/fun-admin into f-6.6.7

src/main/java/com/ctrip/fun/admin/controller/JsonController.java

@@ -1991,7 +1991,7 @@ public class JsonController {
     public @ResponseBody
     public @ResponseBody
     Object changeEventActivityCustomerInfo(@RequestParam(value = "orderId") Integer orderId, @RequestParam(value = "customerId", required = true) Integer customerId,
     Object changeEventActivityCustomerInfo(@RequestParam(value = "orderId") Integer orderId, @RequestParam(value = "customerId", required = true) Integer customerId,
             @RequestParam(value = "customerName", required = true) String customerName, @RequestParam(value = "customerMobile", required = true) String customerMobile,
             @RequestParam(value = "customerName", required = true) String customerName, @RequestParam(value = "customerMobile", required = true) String customerMobile,
-            @RequestParam(value = "userId", required = true) String userId, @RequestParam(value = "operator", required = true) String operator,
+            @RequestParam(value = "userId", required = false) String userId, @RequestParam(value = "operator", required = true) String operator,
             @RequestParam(value = "communeFlag", required = true) boolean communeFlag, @RequestParam(value = "genderFlag", required = true) String gender,
             @RequestParam(value = "communeFlag", required = true) boolean communeFlag, @RequestParam(value = "genderFlag", required = true) String gender,
             @RequestParam(value = "handicap", required = true) int handicap) {
             @RequestParam(value = "handicap", required = true) int handicap) {
         CustomerBean playBean = new CustomerBean();
         CustomerBean playBean = new CustomerBean();

src/main/resources/config/spring-security.xml

@@ -72,6 +72,7 @@
 		<sec:intercept-url pattern="/callcenter/sipPhone/**" access="ROLE_TEL,ROLE_ASSIST,ROLE_PROMOTION" />
 		<sec:intercept-url pattern="/callcenter/sipPhone/**" access="ROLE_TEL,ROLE_ASSIST,ROLE_PROMOTION" />
 		<sec:intercept-url pattern="/communeAdm/queryList" access="ROLE_COMMUNE_SYS_ADMIN" />
 		<sec:intercept-url pattern="/communeAdm/queryList" access="ROLE_COMMUNE_SYS_ADMIN" />
 		<sec:intercept-url pattern="/communeAdm/**" access="ROLE_COMMUNE_SYS_ADMIN,ROLE_COMMUNE_SYS" />
 		<sec:intercept-url pattern="/communeAdm/**" access="ROLE_COMMUNE_SYS_ADMIN,ROLE_COMMUNE_SYS" />
+		<sec:intercept-url pattern="/vipmemberOrder/**" access="ROLE_VIP" />
 		<sec:intercept-url pattern="/**" access="ROLE_DEV" />
 		<sec:intercept-url pattern="/**" access="ROLE_DEV" />
 		<sec:form-login login-page="/adminUser/adminLoginGet" authentication-failure-url="/adminUser/adminLoginError" default-target-url="/marketing/campaign/create" />
 		<sec:form-login login-page="/adminUser/adminLoginGet" authentication-failure-url="/adminUser/adminLoginError" default-target-url="/marketing/campaign/create" />
 		
 		

src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetailTeeTime.ftl

@@ -43,7 +43,7 @@
         </tr>
         </tr>
         <tr>
         <tr>
             <td>底价</td><td>${orderBean.floorPrice!}</td>
             <td>底价</td><td>${orderBean.floorPrice!}</td>
-            <td>确认时间s1</td>
+            <td>确认时间</td>
             <td>
             <td>
                 <button class="btn btn-primary btn-lg" data-toggle="modal" data-target="#myModal">
                 <button class="btn btn-primary btn-lg" data-toggle="modal" data-target="#myModal">
                                                选择时间
                                                选择时间