21 Commits (00f95dda1300da95f58315f22bd14a6d2de98b85)

Author SHA1 Message Date
alwaysfrin 00f95dda13 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class
#	modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
#	modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class
7 years ago
alwaysfrin 883c31288b ignore整理 7 years ago
wei.peng 8eeb76507f 系统先跑起来 7 years ago
wei.peng cdb48374ac 移除iml文件的版本控制 7 years ago
wei.peng 9121cafcff 移除iml文件的版本控制 7 years ago
wei.peng 9361b16c0e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
wei.peng 68d0142f67 权限、角色 实体更新 7 years ago
alwaysfrin 231efdcf13 ignore整理 7 years ago
alwaysfrin 40a7ef7e31 平台功能优化 7 years ago
alwaysfrin c9ce9035e5 国际化 7 years ago
alwaysfrin f6d209250f Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin daf65deb32 国家化封装 7 years ago
wei.peng 6a9e2849ad POJO Commit 7 years ago
wei.peng 190f348f7d POJO Commit 7 years ago
wei.peng 9cd186e66f POJO Commit 7 years ago
alwaysfrin 336f808d58 主键Long型转换json时调整为String 7 years ago
alwaysfrin 39ea4fe7e8 Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin 5f970b9308 shiro优化 7 years ago
wei.peng aaa0a1b21b 初始化系统配置 7 years ago
alwaysfrin 74483040b3 impp核心功能初始化 7 years ago
alwaysfrin a208e592bd 基础对象初始化 7 years ago