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

rain

2024-08-02 7d5e32ab845140711e8c40c7dd1452a9766c68f4

 src/main/java/com/dji/sample/territory/model/entity/TbDkjbxxEntity.java

@@ -21,7 +21,7 @@
@TableName(value = "table_info")
public class TbDkjbxxEntity {

private String fXzqdmsys;
private String fXzqdm;

private String fShape;