Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-24 38470a0317c44220f371ef96a4a1b935ac16bdc0

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java

@@ -40,7 +40,7 @@
    /**
     * 在线小时
     */
    private Integer online;
    private String online;
    /**
     * 奖励金额
     */
@@ -93,11 +93,11 @@
        this.type = type;
    }

    public Integer getOnline() {
    public String getOnline() {
        return online;
    }

    public void setOnline(Integer online) {
    public void setOnline(String online) {
        this.online = online;
    }