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

zyy

2025-06-25 0ba1a0b7a8528d78aa5180fc76bb4975b0da2a47

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

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

    private Integer dzId;

    private Integer newId;
}