Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-10 4f9c122f237fbee16d5ef9c602b6db95d28ed7b0

 java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java

@@ -25,7 +25,7 @@
    private String feeId;


    private Date createTime;
    private String createTime;


    public String getPrimeRate() {
@@ -92,11 +92,12 @@
        this.feeId = feeId;
    }

    public Date getCreateTime() {

    public String getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
}