Merge remote-tracking branch 'origin/2-10' into 2-10

zj

9 days ago 55aff996cb51698c09ab140143511e74c7a8ad5e

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

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

    private Integer dzId;

    //待补资金
    private BigDecimal amountToBeCovered = BigDecimal.ZERO;

    private Integer newId;
}