1. 22 Oct, 2019 1 commit
    • Merge remote-tracking branch 'origin/master' · 443b742b
      # Conflicts:
      #	bsoft-api/pom.xml
      #	bsoft-api/src/main/java/com/bsoft/api/BsoftApiApplication.java
      #	bsoft-api/src/main/java/com/bsoft/api/controller/LoginController.java
      #	bsoft-api/src/main/java/com/bsoft/api/controller/UserController.java
      #	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserMapper.java
      #	bsoft-api/src/main/java/com/bsoft/api/model/SysUser.java
      #	bsoft-api/src/main/java/com/bsoft/api/service/Impl/LoginServiceImpl.java
      #	bsoft-api/src/main/resources/application-dev.properties
      #	bsoft-api/src/main/resources/application.properties
      #	bsoft-api/src/main/resources/mapper/SysUserMapper.xml
      #	bsoft-api/src/test/resources/generatorConfig.xml
      whl committed
  2. 21 Oct, 2019 3 commits
  3. 18 Oct, 2019 1 commit
  4. 14 Oct, 2019 2 commits
  5. 09 Oct, 2019 5 commits
  6. 08 Oct, 2019 2 commits