Merge remote-tracking branch 'origin/test' into 云从对接

device-api-service-merc-mini/src/main/java/com/xy/controller/DeviceAlgorithmChargingController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @AllArgsConstructor
-@Api(tags = "小程序-设备计费历史表")
+@Api(tags = "小程序-设备算法计费表")
 @RestMappingController("merc-mini/device-algorithm-charging")
 public class DeviceAlgorithmChargingController {