Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

ali

2025-02-14 25648562a9c396f9013a26b4a892155ee77becbb

 zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java

@@ -26,9 +26,8 @@
 * @Version: 1.0
 * @Since: JDK1.8
 */

@Slf4j
@Api("采集计量表数据管理")
@Slf4j
@RestController
@RequestMapping("/meters")
public class MeterController extends BaseController {