Skip to content

S
sv-springboot
Switch branch/tag
  1. 28 Oct, 2019 7 commits
  3. 24 Oct, 2019 13 commits
  5. 23 Oct, 2019 7 commits
    • generator 配置修改，去掉自定义JavaType解析 · 153db53e
      whl committed
    • bug fix · 895bd902
      whl committed
    • Nvarchar2改为varchar2 · 8a7f0116
      whl committed
    • Merge remote-tracking branch 'origin/future-page-ywd' into dev · a7026e88 
      # Conflicts:
#	bsoft-api/src/main/java/com/bsoft/api/model/DicDim.java
#	bsoft-api/src/main/java/com/bsoft/api/model/DicInd.java
#	bsoft-api/src/main/java/com/bsoft/api/model/DicOrg.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerBlock.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerPage.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerPageBlockRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerPageDimRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysMenu.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysOrg.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysProject.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysRole.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysRoleMenuRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUserMenuRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUserOrgRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUserRoleRs.java
#	bsoft-api/src/main/resources/mapper/DicDimMapper.xml
#	bsoft-api/src/main/resources/mapper/DicIndMapper.xml
#	bsoft-api/src/main/resources/mapper/DicOrgMapper.xml
#	bsoft-api/src/main/resources/mapper/SerBlockMapper.xml
#	bsoft-api/src/main/resources/mapper/SerPageBlockRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SerPageDimRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SerPageMapper.xml
#	bsoft-api/src/main/resources/mapper/SysMenuMapper.xml
#	bsoft-api/src/main/resources/mapper/SysOrgMapper.xml
#	bsoft-api/src/main/resources/mapper/SysProjectMapper.xml
#	bsoft-api/src/main/resources/mapper/SysRoleMapper.xml
#	bsoft-api/src/main/resources/mapper/SysRoleMenuRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserMenuRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserOrgRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserRoleRsMapper.xml
      whl committed
    • 提交model和mapper · 381f7cd4
      Suvalue committed
    • Merge remote-tracking branch 'origin/future-page-ywd' into dev · 33ab5cea 
      # Conflicts:
#	bsoft-api/src/main/java/com/bsoft/api/mapper/DicDimMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/DicIndMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/DicOrgMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SerBlockMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageBlockRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageDimRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysMenuMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysOrgMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysProjectMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysRoleMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysRoleMenuRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserMenuRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserOrgRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserRoleRsMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUser.java
      whl committed
    • 添加菜单接口 · 90b112f1
      Suvalue committed
  7. 22 Oct, 2019 3 commits
  9. 21 Oct, 2019 2 commits
  11. 18 Oct, 2019 1 commit
  13. 14 Oct, 2019 2 commits
  15. 09 Oct, 2019 5 commits