Merge remote-tracking branch 'origin/6-29' into 6-29

zj

2025-06-27 ea772fcdef390ca8bdb6746a1504e5ca88037d00

 src/main/java/com/nq/pojo/UserPosition.java

@@ -59,5 +59,7 @@
    private BigDecimal marginAdd;

    private Integer dzId;

    private Integer newId;
}