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

zj

8 days ago 55aff996cb51698c09ab140143511e74c7a8ad5e

 src/main/java/com/nq/vo/position/UserPositionVO.java

@@ -65,4 +65,6 @@
    private String profitAndLoseParent;

    private BigDecimal amountToBeCovered = BigDecimal.ZERO;

    private Boolean isListed = true;
}