Merge remote-tracking branch 'origin/dev' into dev

performance-web/src/main/java/com/clx/performance/controller/pc/DriverNoticeConfigController.java

@@ -7,6 +7,7 @@ import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -51,7 +52,7 @@ public class DriverNoticeConfigController {
     @ApiOperation(value = "司机通知配置启用", notes = "<br>By:姜武杰")
     @PostMapping("/enable")
     @UnitCovert
-    public Result enableConfig(@NotNull(message = "id不能为空") @Validated Integer id) {
+    public Result enableConfig(@ApiParam("id") @RequestParam("id") @NotNull(message = "id不能为空") @Validated Integer id) {
         driverNoticeConfigService.enableConfig(id);
         return Result.ok();
     }
@@ -59,7 +60,7 @@ public class DriverNoticeConfigController {
     @ApiOperation(value = "司机通知配置禁用", notes = "<br>By:姜武杰")
     @PostMapping("/disable")
     @UnitCovert
-    public Result disableConfig(@NotNull(message = "id不能为空") Integer id) {
+    public Result disableConfig(@ApiParam("id") @RequestParam("id") @NotNull(message = "id不能为空") Integer id) {
         driverNoticeConfigService.disableConfig(id);
         return Result.ok();
     }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildOperateRecordSqlProvider.java

@@ -20,7 +20,7 @@ public class OrderChildOperateRecordSqlProvider {
                     "receive_address," +
                     "good_type_name," +
                     "remark," +
-                    "operate_time date_format(operate_time, '%Y-%m-%d %H:%i:%s') as operateTime," +
+                    "date_format(operate_time, '%Y-%m-%d %H:%i:%s') as operateTime," +
                     "operator"
             );
             FROM("order_child_operate_record ");