Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #80

Merged
merged 5 commits into from
Jun 3, 2021
Merged

Dev #80

merged 5 commits into from
Jun 3, 2021

Commits on Jun 1, 2021

  1. 多个时间段重叠计算

    @xkzhangsan
    xkzhangsan committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    b652c1c View commit details
    Browse the repository at this point in the history

  2. 多个时间段重叠计算

    @xkzhangsan
    xkzhangsan committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    3662fdc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/xkzhangsan/xk-time.git into dev 

    Conflicts:
	src/main/java/com/xkzhangsan/time/calculator/DateTimeCalculatorUtil.java
	src/test/java/com/xkzhangsan/time/test/DateTimeCalculatorUtilTest.java
    @xkzhangsan
    xkzhangsan committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    2c15a0b View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. 代码优化

    @xkzhangsan
    xkzhangsan committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    edb44cb View commit details
    Browse the repository at this point in the history

  2. readme修改，对工作日计算方法，增加2021年放假信息。

    @xkzhangsan
    xkzhangsan committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    5fb7d10 View commit details
    Browse the repository at this point in the history