Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmClinicPoints.java

@@ -37,7 +37,7 @@

    @ApiModelProperty(value = "积分数")
    @TableField("points")
    private Double points;
    private Integer points;

    @ApiModelProperty(value = "积分到期时间")
    @TableField("expire_time")