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

rain

2024-08-20 74d1c21ebb6b3b916904d95d13d289df23dcdedd

 src/main/java/com/dji/sample/territory/service/ITbFJService.java

@@ -27,5 +27,5 @@
     * @param lotInfo
     * @throws Exception
     */
    void insertOneData(MediaFileEntity mediaFile, LotInfo lotInfo) throws Exception;
    int insertOneData(MediaFileEntity mediaFile, LotInfo lotInfo) throws Exception;
}