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

aix

2024-07-30 249d316e0b8c79b71b779b5716bc488e1d08a9b3

 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;