Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

 phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java

@@ -27,4 +27,6 @@
    private String recordId;
    /**操作类型*/
    private Integer opType;
    //是否过滤领建数据
    private Integer isFilterate;
}