Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performancesStatic.html

@@ -35,12 +35,12 @@
                         <div th:text="*{totalGeneral}">80</div>
                     </div>
                 </div>
-                <div class="col-lg-1">
-                    <div>
-                        <div>已兑换总数(张)</div>
-                        <div th:text="*{totalExchange}">0</div>
-                    </div>
-                </div>
+<!--                <div class="col-lg-1">-->
+<!--                    <div>-->
+<!--                        <div>已兑换总数(张)</div>-->
+<!--                        <div th:text="*{totalExchange}">0</div>-->
+<!--                    </div>-->
+<!--                </div>-->
 <!--                <div class="col-lg-1">-->
 <!--                    <div>-->
 <!--                        <div>兑换库存(张)</div>-->
@@ -100,9 +100,9 @@
                 <th>
                     <div class="cell">销售额（元）</div>
                 </th>
-                <th>
-                    <div class="cell">兑换数量</div>
-                </th>
+<!--                <th>-->
+<!--                    <div class="cell">兑换数量</div>-->
+<!--                </th>-->
             </tr>
             </thead>
             <tbody>
@@ -137,9 +137,9 @@
                 <td>
                     <div class="cell" th:text="${respBean.totalSalePrice}">0</div>
                 </td>
-                <td>
-                    <div class="cell" th:text="${respBean.totalExchange}">0</div>
-                </td>
+<!--                <td>-->
+<!--                    <div class="cell" th:text="${respBean.totalExchange}">0</div>-->
+<!--                </td>-->
             </tr>
             </tbody>
         </table>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/kylin/DataController.java

-package com.liquidnet.service.platform.controller.kylin;
-
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.platform.service.impl.kylin.DataImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@Api(tags = "数据迁移 (会重复)")
-@RestController
-@RequestMapping("data")
-public class DataController {
-
-    @Autowired
-    private DataImpl data;
-
-    @PostMapping("performance")
-    @ApiOperation("演出数据迁移")
-    public ResponseDto<Boolean> performance() {
-        Boolean result = data.performance();
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("order")
-    @ApiOperation("订单数据迁移")
-    public ResponseDto<Boolean> order(String month) {
-        Boolean result = data.order(month);
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("roadShow")
-    @ApiOperation("巡演数据迁移")
-    public ResponseDto<Boolean> roadShow() {
-        Boolean result = data.roadShow();
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("childAccount")
-    @ApiOperation("验票子账号数据迁移")
-    public ResponseDto<Boolean> childAccount() {
-        Boolean result = data.childAccount();
-        return ResponseDto.success(result);
-    }
-
-}
+//package com.liquidnet.service.platform.controller.kylin;
+//
+//import com.liquidnet.service.base.ResponseDto;
+//import com.liquidnet.service.platform.service.impl.kylin.DataImpl;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//
+//@Api(tags = "数据迁移 (会重复)")
+//@RestController
+//@RequestMapping("data")
+//public class DataController {
+//
+//    @Autowired
+//    private DataImpl data;
+//
+//    @PostMapping("performance")
+//    @ApiOperation("演出数据迁移")
+//    public ResponseDto<Boolean> performance() {
+//        Boolean result = data.performance();
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("order")
+//    @ApiOperation("订单数据迁移")
+//    public ResponseDto<Boolean> order(String month) {
+//        Boolean result = data.order(month);
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("roadShow")
+//    @ApiOperation("巡演数据迁移")
+//    public ResponseDto<Boolean> roadShow() {
+//        Boolean result = data.roadShow();
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("childAccount")
+//    @ApiOperation("验票子账号数据迁移")
+//    public ResponseDto<Boolean> childAccount() {
+//        Boolean result = data.childAccount();
+//        return ResponseDto.success(result);
+//    }
+//
+//}