Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 e345b36025818615eb68d37819eaff312d1fb986

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/HistoryVo.java

@@ -9,6 +9,7 @@
public class HistoryVo {
    Date createTime;
    String state;
    // 0减少 1增加
    Integer addordown;
    Double money;