Silliter
|
dbeb965e9b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
wei.peng
|
e4adb35413
|
自定义表单 数据对象 新增接口完成
|
6 years ago |
|
wei.peng
|
e4a3b95f16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1049a11576
|
自定义表单 数据对象 新增接口完成
|
6 years ago |
|
Silliter
|
ec50aef781
|
开发单据打印
|
6 years ago |
|
wei.peng
|
f039095f83
|
数据对象实体更新
创建数据对象 Model
|
6 years ago |
|
Silliter
|
111c6177c9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
alwaysfrin
|
ea2eb6103d
|
优化调整
|
6 years ago |
|
Silliter
|
b1f195a185
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
738db8d837
|
条码打印开发，角色微服务提供
|
6 years ago |
|
Silliter
|
618ce5d560
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
c4ef1e66f3
|
开发条码打印后端
|
6 years ago |
|
wei.peng
|
8ec8dba414
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
05efe333cc
|
开发打印模板功能
|
6 years ago |
|
Silliter
|
cc4484a562
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
柯裕
|
398a3d98c5
|
更新POJO
|
6 years ago |
|
柯裕
|
e3ae013868
|
更新POJO
|
6 years ago |
|
柯裕
|
ce9cbe1198
|
更新pojo
|
6 years ago |
|
Silliter
|
ba90dfb123
|
开发交易处理主程序
|
6 years ago |
|
Silliter
|
b0d34a04b4
|
调整model实体
|
6 years ago |
|
Silliter
|
e80d476902
|
调整model实体
|
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
|
c61d0882c5
|
模板管理生成HTML 完成
|
6 years ago |
|
wei.peng
|
ae08c3ef76
|
模板管理 后台功能完成
|
6 years ago |
|
wei.peng
|
19a8189b05
|
模板管理 后台功能完成
|
6 years ago |
|
wei.peng
|
2bd16137bd
|
模板管理 后台功能完成
|
6 years ago |
|
wei.peng
|
1e43b2e36f
|
模板Pojo 调整
|
6 years ago |
|
wei.peng
|
324c7aa413
|
自定义报表 目录功能 联调完成
|
6 years ago |
yunhao.wang
|
7d4f3ebb67
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
79ad222295
|
用户密码加密侧率功能完成
|
6 years ago |
|
Silliter
|
c45091584c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
b8a1196a45
|
添加自定义组件
|
6 years ago |
|
Silliter
|
a4d59caaeb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
b55906ced0
|
生产领料优化
|
6 years ago |
|
wei.peng
|
0550adce28
|
用户管理更新
|
6 years ago |
|
Silliter
|
cc3bb9e9ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
3750b11b88
|
用户管理更新
|
6 years ago |
|
柯裕
|
1df72e1d4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
93ff5ad071
|
移动条码对象封装
|
6 years ago |
amy
|
f456ff2f75
|
入库上架扫描条码
|
6 years ago |
|
wei.peng
|
9b1acb4b8f
|
Merge branch 'dev' into test
|
6 years ago |
|
柯裕
|
0a8ffd10ec
|
组件优化
|
6 years ago |
|
yunhao.wang
|
7b2d7f78dd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
cfd1a26b36
|
流程管家业务优化
|
6 years ago |
|
yunhao.wang
|
8cb5c2ee1a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
柯裕
|
44367c9240
|
组件条件封装
|
6 years ago |
|
Silliter
|
faf1c1318f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
fba7c1a6da
|
添加 isChecked
|
6 years ago |
|
wei.peng
|
47105866be
|
合并代码 解决冲突
|
6 years ago |
|
wei.peng
|
3d89bae88f
|
动态 Table 功能优化
|
7 years ago |
|
wei.peng
|
adbcbb16a0
|
动态 Table 功能优化
|
7 years ago |
|
wei.peng
|
786c652900
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
95a58d97a2
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
bd3ab06440
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
wei.peng
|
35ecf85881
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
47dd4c68b5
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
0d7e773a49
|
动态表单 基础功能完成
|
7 years ago |
|
wei.peng
|
2ad41030e6
|
合并代码 并打开 MQ 以及邮箱
|
7 years ago |
|
wei.peng
|
9eb7122e99
|
发布 正式版本 1.0
|
7 years ago |
|
yunhao.wang
|
cb95d0a713
|
项目pom版本更新为test
|
7 years ago |
|
Silliter
|
1b54063b56
|
优化代码
|
7 years ago |
|
amy
|
7706f19445
|
抽点model创建
|
7 years ago |
|
Silliter
|
62dcedc133
|
解决冲突
|
7 years ago |
|
Silliter
|
bfc1d5ba2b
|
解决冲突
|
7 years ago |
|
wei.peng
|
855d9abef8
|
1、复杂树 功能完成
|
7 years ago |
|
wei.peng
|
703fa5158a
|
用户增删改功能开发
|
7 years ago |
|
wei.peng
|
1efbeb3d5f
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
wei.peng
|
f20d8cab3d
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
wei.peng
|
7b080b6a3a
|
删除target 文件夹 或者删除.iml 文件
|
7 years ago |
|
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
|
cdb48374ac
|
移除iml文件的版本控制
|
7 years ago |
|
wei.peng
|
9121cafcff
|
移除iml文件的版本控制
|
7 years ago |
|
alwaysfrin
|
231efdcf13
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
daf65deb32
|
国家化封装
|
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 |