• gongwenjie's avatar
    Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0 · f2b6a7c8
    gongwenjie 提交于
    # Conflicts:
    #	notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/ApprovalInformationServiceImpl.java
    #	notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java
    #	notes-union/src/main/resources/application.properties
    #	notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java
    f2b6a7c8
名称
最后提交
最后更新
..
main 正在载入提交数据...
test/java/com/zjty/tynotes/attendance 正在载入提交数据...