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

aix

2024-07-30 259b893309f8c06a22adc8455f44bcc486d796c7

 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;