0
0

Merge branch 'dyf-device'

# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
#	fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java
This commit is contained in:
2025-07-31 09:16:52 +08:00
17 changed files with 674 additions and 73 deletions

View File

@ -1,4 +1,4 @@
package com.fuyuanshen.equipment.utils.c.map;
package com.fuyuanshen.equipment.utils.map;
import com.alibaba.fastjson2.JSONObject;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.fuyuanshen.equipment.utils.c.map;
package com.fuyuanshen.equipment.utils.map;
/**
* @author: 默苍璃