 钮海涛
|
005d0f7f86
|
修复合并问题
|
5 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
5 years ago |
wynne1005
|
4ed1770189
|
Merge branch 'dev' into test
|
5 years ago |
 王杰
|
de200de372
|
mes
|
5 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
5 years ago |
|
wei.peng
|
fe94ad9bf3
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
wei.peng
|
8aab106aa9
|
合并代码 pom 冲突
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
|
5 years ago |
|
wei.peng
|
279ec2d1fe
|
授权加密问题修复
|
5 years ago |
袁津哲
|
b23915236b
|
开发根据实体动态生成数据库文档页面功能
|
5 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
2e2ee2cc6c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
2cc43af431
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
5 years ago |
 曾贞一
|
f3e53ff1eb
|
【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】
【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】
|
5 years ago |
|
wei.peng
|
3aa1afb0ce
|
对象历史记录 Pojo 创建
|
5 years ago |
|
wei.peng
|
c8197f3290
|
1. 授权封装位置调整
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
|
5 years ago |
|
wei.peng
|
effae233bf
|
对象历史记录 Pojo 创建
|
5 years ago |
|
wei.peng
|
fe46d8da29
|
1. 授权封装位置调整
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
|
5 years ago |
|
wynne1005
|
fb60d75eea
|
还原test pom
|
5 years ago |
|
wynne1005
|
d6fe718e4c
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
109c4429ce
|
还原dev pom
|
5 years ago |
|
袁津哲
|
9518628c12
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
533d8e55e8
|
开发导入模块功能
|
5 years ago |
汪云昊
|
ccf2f42840
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
edf0b66115
|
Sonar代码缺陷修复
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
|
5 years ago |
陈思洁
|
5d8fec4938
|
合并冲突
|
5 years ago |
|
陈思洁
|
7505087392
|
【mes 产品配方导入功能和基础数据维护】
|
5 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
5 years ago |
|
钮海涛
|
100d8b0019
|
Merge branch 'test' into dev
|
5 years ago |
|
汪云昊
|
34c77d6944
|
ICS 注册中心监控接口，Actuator对外端口调整
|
5 years ago |
puxiao.liao
|
a2f7c3426e
|
bug7994【7994 麦格纳收货需求差异】
|
5 years ago |
|
汪云昊
|
1051b22575
|
ICS 注册中心监控对象
|
5 years ago |
|
钮海涛
|
288fb4a16b
|
修改POM版本号
|
5 years ago |
|
汪云昊
|
2772ea6a2f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-ptl/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
5 years ago |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
5 years ago |
|
汪云昊
|
e7d176209e
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
64d83d238f
|
Merge branch 'dev' of wei.peng/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
wei.peng
|
1d00303306
|
自定义报表-折线图,饼图,柱状图,矩形图 完成
|
5 years ago |
|
钮海涛
|
82d5332861
|
修复POM文件问题
|
5 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
5 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
5 years ago |
|
wynne1005
|
44696061ee
|
修改pom文件为最新
|
5 years ago |
|
wei.peng
|
c8c7c73336
|
自定义报表 布局,元素,报表 功能优化完成
|
5 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
5 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
5 years ago |
|
wynne1005
|
4b4bf4e433
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
许心洁
|
5bf7133ff1
|
动态查询：BUG#7845；BUG#7676；BUG#7675
|
5 years ago |
|
曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
5 years ago |