23 Commits (a7833ea9dd301ec16f374363adcc994bcfb8c1fd)

Author SHA1 Message Date
jenkins a7833ea9dd Merge remote-tracking branch 'origin/dev' into test 6 years ago
yiming.gu 7c647c7844 1、班次pojo修改
2、andon项目新增组织模型基础数据
6 years ago
allen.zhang 5f5b3b84bd Merge branch 'dev' into test 6 years ago
yiming.gu b1f513d786 新增设备pojo,组织模型model 6 years ago
Silliter fe644066af Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter 1b97e377f2 pojo引入jar包 6 years ago
wei.peng 93f4745afd Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
# Conflicts:
#	pom.xml
6 years ago
wei.peng 045c68ee2e 数据对象管理接口开发完成 6 years ago
Silliter cc4484a562 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter 3faba3bbc2 实体调整 6 years ago
wei.peng a2bbd4b5f0 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng ae08c3ef76 模板管理 后台功能完成 6 years ago
wei.peng 19a8189b05 模板管理 后台功能完成 6 years ago
wei.peng 1e43b2e36f 模板Pojo 调整 6 years ago
wei.peng 47105866be 合并代码 解决冲突 6 years ago
wei.peng 47dd4c68b5 配置文件修改 Test to dev 7 years ago
wei.peng 9eb7122e99 发布 正式版本 1.0 7 years ago
yunhao.wang cb95d0a713 项目pom版本更新为test 7 years ago
wei.peng f20d8cab3d 定时任务
定时任务表达式     功能完成
    定时任务           功能完成

权限
    用户管理           功能完成
    用户登录           功能完成
7 years ago
alwaysfrin 336f808d58 主键Long型转换json时调整为String 7 years ago
wei.peng aaa0a1b21b 初始化系统配置 7 years ago
alwaysfrin 74483040b3 impp核心功能初始化 7 years ago
alwaysfrin a208e592bd 基础对象初始化 7 years ago