 王杰
|
35cf3cf162
|
Merge branch 'dev' into test
|
6 years ago |
 钮海涛
|
5b712ce774
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
|
钮海涛
|
d99ad6c44a
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
|
钮海涛
|
5183163abd
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
crish
|
18161e8191
|
Merge branch 'test'
|
6 years ago |
|
许心洁
|
0c20a2b655
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
16162542ba
|
1：修改listByPage由GET方法为POST方法。
|
6 years ago |
|
许心洁
|
1d0a2351b9
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
1f9fc9f280
|
1：新增实现生产时间的计算逻辑
|
6 years ago |
|
许心洁
|
d5864ba490
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
6816c7b566
|
1：新增实现生产时间的计算逻辑
|
6 years ago |
|
crish
|
fa4f58ec6c
|
pom冲突
|
6 years ago |
刘辉
|
4ffc63ce83
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
5a682467d1
|
1：在字段信息表中新增枚举项数组，前端在选择枚举内容时不需要再从后端获取。
|
6 years ago |
|
许心洁
|
9fa2f376e4
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
2dc63a9a4e
|
1：修改部分字段默认在界面不显示
2：为字段新增默认值。
|
6 years ago |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
于学杰
|
68a6c85068
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
8a316ff2d5
|
add mrp function to aps
|
6 years ago |
|
许心洁
|
7863325afd
|
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
|
6 years ago |
|
许心洁
|
b7b78b85ac
|
误拉了test分支的代码：还原
|
6 years ago |
|
王杰
|
18bc35f60d
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
5c68a15d0c
|
add mrp function to aps
|
6 years ago |
|
许心洁
|
61804a27b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
980cb2a56b
|
add product order spread to aps
|
6 years ago |
|
许心洁
|
e35cf183da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
10ce1e165e
|
add order spread to aps
|
6 years ago |
|
王杰
|
80f50fe800
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
1d281da531
|
add order spread to aps
|
6 years ago |
jenkins
|
479caf432d
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
be30cecf13
|
add integration to aps
|
6 years ago |
|
jenkins
|
e56a5b037c
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
4a78dfa493
|
add integration to aps
|
6 years ago |
|
jenkins
|
790c0b4ec6
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
f8b385d274
|
add integration to aps
|
6 years ago |
|
jenkins
|
cbc5882bd5
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
153238d31a
|
add integration to aps
|
6 years ago |
|
jenkins
|
c29c350ef8
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
6b182cf4b5
|
add fix controller bugs
|
6 years ago |
 曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
钮海涛
|
68da44de9e
|
add expression to aps
|
6 years ago |
|
钮海涛
|
d3194ac4bc
|
add expression to aps
|
6 years ago |
|
钮海涛
|
70868503d4
|
add beans services controllers to aps
|
6 years ago |
|
钮海涛
|
3c907fe88a
|
add material bean to aps
|
6 years ago |
|
钮海涛
|
6008478aec
|
add customer field function
|
6 years ago |