I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,437 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '9c7d455998'
${ noResults }
Commit Graph

6991 Commits (9c7d4559980c8dc41948bb858cb222bb7a781a4d)

Author SHA1 Message Date
joke.wang b389da7c2f Fix Bug #11260 5 years ago
puxiao.liao c91511185a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 3cf5c70774 修复MGN系列BUG 5 years ago
陈思洁 40cef1961c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 8a1f0c608e 【基础页面增加替代料功能】 5 years ago
宋军超 baafe4cd49 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 b978fa390c 修改天津麦格纳涂装计划查询报表和涂装工单导入 5 years ago
puxiao.liao f1715db664 Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
陈思洁 644454294c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 676e43fc33 【增加查询参数条件】 5 years ago
王杰 5e229b7176 message pool 5 years ago
汪云昊 1ce2793faa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 799967bde5 修改天津麦格纳问题 5 years ago
汪云昊 7a4be36111 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 156dd53402 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 130d3a9792 feat:字典规则调整允许值为空 5 years ago
汪云昊 ab608c0919 feat:用户导出 5 years ago
宋军超 91aa6f61a0 删除预装区查询接口 5 years ago
陈思洁 2af946a4bf Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 9fde75101e 【11181 19048-组织模型新增数据和保存的数据不一致！-2020-09-09】 5 years ago
wynne1005 9bfd9ef279 Merge branch 'master' into test 5 years ago
wynne1005 beaeccf1ed 冲突合并 5 years ago
wynne1005 48b6634032 新增枚举 样本类型 5 years ago
宋军超 c5ebcaf2b5 天津麦格纳添加出入库事务表枚举 5 years ago
puxiao.liao 97a8a5a6ec 修复MGN系列BUG 5 years ago
puxiao.liao 698128aff5 MGN修复BUG 5 years ago
宋军超 7a6bda2994 天津麦格纳问题修复 5 years ago
陈思洁 2c91dfba60 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e4dc2e1a46 【2637 08 ext 20042 PCN界面优化，log调整 0804】 5 years ago
joke.wang d33dae14dc jsp计算bug优化 5 years ago
曾贞一 99e63fea8c 【2741 北京麦格纳WMS-质检跳批】 5 years ago
宋军超 f73e826cd8 天津麦格纳问题修复 5 years ago
钮海涛 729a7b6990 合并冲突 5 years ago
钮海涛 5c9da87650 合并冲突 5 years ago
钮海涛 d47607880e 合并冲突 5 years ago
钮海涛 56b1ae99a9 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 1b6bbed47c Fix Bug #10974 5 years ago
曾贞一 193cff013f 【2737 09 1.2.1.9.1库位新增库位别名】 5 years ago
joke.wang b8c743896d 拆解接口表优化 5 years ago
puxiao.liao 61b87d2d00 MGN修复BUG 5 years ago
puxiao.liao 15d915370e MGN修复BUG 5 years ago
曾贞一 fe9a19c534 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6ca0948a5d 【11026 20011--有关北美收货产生的需求变更--0910】 5 years ago
宋军超 b0aba21859 中航导入问题修复 5 years ago
曾贞一 5dc142ba34 【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】 5 years ago
songss bdf708b73a 增加上传图片job 5 years ago
joke.wang 045babeee1 已生产队列查询修改 5 years ago
joke.wang ba940f9a39 BYPASS项映射关系表 5 years ago
汪云昊 0a0727e2fa fix:代码错误 5 years ago
汪云昊 f878e6b283 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 2e102f4189 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 1ccd4f3b65 feat:添加区间查询 5 years ago
puxiao.liao 48a6dec057 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 9a7bef44ac MGN修复BUG 5 years ago
陈思洁 01fc8bb062 【条码履历增加字段】 5 years ago
陈思洁 75fe475b53 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 01eda59dd5 【11069 19048- 抛光质量待定扫描条码后，提示信息不明确！-2020-09-05】 5 years ago
王杰 396dcdf56c 涂装 一箱 优化 5 years ago
曾贞一 332e37ea94 【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】 5 years ago
宋军超 b7542f8db0 修改中航问题 5 years ago
wynne1005 38096fb04e mes表名过长不兼容oracle 5 years ago
汪云昊 6457cac828 feat:去除非空校验 5 years ago
曾贞一 54dc09ff76 【冲突解决】 5 years ago
曾贞一 9ebe3c17b7 【枚举状态】 5 years ago
joke.wang bd8cc364c1 jsp计算优化 5 years ago
汪云昊 1243607e0e Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 5fbd0fdd80 fix:单号生成记录 5 years ago
puxiao.liao 26367ea28d Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
汪云昊 cf2bf8d291 企业微信适配 5 years ago
rock.yu 6e37cd934b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu d7133b24f5 增加缺失的字段 5 years ago
陈思洁 decd0ae558 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 6c351c09b5 【11016 19048- 总装生产计划显示多条！-2020-09-03】 5 years ago
曾贞一 8ca16d7c68 【枚举状态】 5 years ago
许心洁 7f11e5b1d7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 1fe5b807c6 BUG#10826,11025,11024 5 years ago
曾贞一 92e8364b58 【1140 09 1.2.1.1.1客户发运车辆推荐】 5 years ago
曾贞一 62733aa799 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a53e7c5724 【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】 5 years ago
puxiao.liao acbad1a637 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
 5 years ago
puxiao.liao df4e794a48 修复MGN系列BUG 5 years ago
rock.yu 1e5fe42702 完成了麦格纳质检录入不良数量的功能 5 years ago
曾贞一 a0b50da83e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c06c504805 【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】 5 years ago
joke.wang 746a17bd75 bj-mgn辅助展示组件 5 years ago
songss 7243e20cc8 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss d5d6f2cfee 修改枚举值 5 years ago
陈思洁 5dd7cc44b2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 fad811c2bc 【增加索引】 5 years ago
joke.wang 18ca368f3c 照片采集 5 years ago
puxiao.liao 679ad59b86 Fix bug#10977 
19128+MES工单生成WMS领料任务无法生成+20200901
 5 years ago
wynne1005 4bdfebede1 中航打包PCR完成 5 years ago
puxiao.liao 0e89f89327 修复MGN系列BUG 5 years ago
puxiao.liao 137c45b5cc 修复MGN系列BUG 5 years ago
汪云昊 b2517a11b8 feat(用户登录日志):用户登录日志查询及导出功能 5 years ago
陈思洁 564fdb261b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 03730fe13c 【[#2702::07 ext 虚拟工单关闭按钮（注塑、涂装、组装） ] 】 5 years ago
wynne1005 fa8beadc4f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 191220442f websocket错误提示音 5 years ago
rock.yu 3935bde8f6 同步 SAP 数据同步 JOB（从仪征同步） 5 years ago
wynne1005 89ec0cbd71 解决冲突 5 years ago
wynne1005 d86c84a39e 添加工步返回表格背景色 5 years ago
许心洁 73c0ae5d42 优化合并仪征代码 5 years ago
陈思洁 df2342e097 【2703 07 ext 虚拟工单关闭按钮（注塑、涂装、组装）】 5 years ago
puxiao.liao 1eb3622d19 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
alwaysfrin 8b6271cebc 1，数据源参数配置优化 
2，读写分离数据源切换优化
3，日志切面优化调整
4，登陆线程优化
5，对象新增、修改监听优化
 5 years ago
songss 19f1cf85c4 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss fad439a5a0 增加MES状态机Repository类 5 years ago
puxiao.liao b8a938df2e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 23d8afd0ae Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 09c95d3542 【库存排程配置增加禁用启用接口】 5 years ago
joke.wang 3815c1c730 扭矩采集plc优化 5 years ago
puxiao.liao 2527fe0163 修复MGN系列BUG 5 years ago
陈思洁 381ff0c974 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 de248a944f 【2701 08 1.2.3.3.8 涂装检测工位，显示合格数、不良数】 5 years ago
钮海涛 51746154ba 合并dev到test 5 years ago
钮海涛 e6b472bcfd 合并test代码到dev 5 years ago
钮海涛 98b992408c Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
曾贞一 57aae56345 【2690 ext新增委外库存查询报表 -后端】 5 years ago
wynne1005 f06f51cc7e master merge test 5 years ago
rock.yu f6b812aaf8 PDA组件原生支持脚本组件 5 years ago
joke.wang b09aa27e0f 排程job 5 years ago
rock.yu 9be1dd70d5 盘点明细表 lotno 字段增加默认值 5 years ago
汪云昊 feace77fc3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 7f91f1269c 修复MGN系列BUG 5 years ago
汪云昊 731a92fa2c Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 6dc0d94085 feat:适配器添加空报文保存开关 5 years ago
汪云昊 4dc40c79dd fix:pager.startRow重复计算 5 years ago
钮海涛 3bca09c091 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 8d38a297d2 三力士演示demo 5 years ago
汪云昊 7e678e747d feat:移除mongo日志持久化方法 5 years ago
puxiao.liao 36e9000710 麦格纳BUG 5 years ago
joke.wang a2eab983d9 缓存池订单池增加jit_seq字段 5 years ago
钮海涛 2133d0d7e4 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f0023a2232 三力士演示demo 5 years ago
曾贞一 c1cb461f36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a9e97d4e28 【2688 08 extPDA-查询查看零件对应库位】 
【2683 08 ext单据打印新增字段查询和显示】
【2682 08 ext单据打印新增模板选择】
 5 years ago
钮海涛 0b6764e8fe Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 6dd429d328 三力士演示demo 5 years ago
songss a2f257e414 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss df6f0bb4f2 删除没用代码 5 years ago
songss f4d7e55f05 喷涂过程条码批量打印报错bug修复 5 years ago
陈思洁 0325e3dc95 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 98afecf57b 【10877 19048-预组装看板及操作工位变更调整-20200828】 5 years ago
wynne1005 a580c70c04 添加正态分布数据总数 5 years ago
wynne1005 762b73dddf 添加StepResult的返回cmd CLEAR_CACHE 5 years ago
wynne1005 9563ebeb66 normalDistribution 5 years ago
wynne1005 b4b1c2f3f8 erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 0fd5989864 新增帮助类型的busiType 5 years ago
rock.yu 42187ebadc 完善流程管家日志信息 5 years ago
钮海涛 85395e84fd 合并dev代码 5 years ago
钮海涛 2013d47353 合并dev代码 5 years ago
宋军超 940510ea5b 北京海纳川、北京麦格纳问题修复 5 years ago
陈思洁 d7f8796d36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee1b0b5b67 【2674 预装区基础页面开发】 5 years ago
puxiao.liao d63d07ad7e 麦格纳收货BUG 5 years ago
joke.wang ac55ae1df1 库存排程配置增加物料名称 5 years ago
王杰 7a502c45c9 注塑上料 展示组件增加字段 5 years ago
陈思洁 baa7d144b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 daf0b94314 【10828 19048-10827-预装作业界面优化！-2020-08-25】 5 years ago
曾贞一 3f2232d741 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 ec7aee68a7 【10744 20011--二维码收货时，如果该零件号设置了特殊批次，则扫描系统自己生成的二维码时永远报错“条码未维护供应商批次 执行成功请扫描二维码”，实际批次已经存在与条码最后一个字段中--0830】 5 years ago
宋军超 53d392ebe1 海纳川问题修复枪头更换添加弹框校验 5 years ago
wynne1005 ebd12f7c65 去除ProductBiModel重复字段 5 years ago
wynne1005 f9fa5814f6 冲突解决 5 years ago
wynne1005 40ec96a390 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 bbcd0c8f69 去除多余枚举 5 years ago
许心洁 2cc6abb902 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 291c0b2a40 BUG#10584,BUG#10784,BUG#10785 5 years ago
钮海涛 9a41c2e2e0 合并test到dev 5 years ago
钮海涛 025cc19f68 合并dev到test 5 years ago
钮海涛 347f6671f2 合并dev到test 5 years ago
钮海涛 99b8cb146c Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
wynne1005 3769a630fe Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 42a340d0c0 timeModuleInit 5 years ago
宋军超 f3cb06ba5a Merge remote-tracking branch 'origin/test' into test 5 years ago
宋军超 030343f2ce 海纳川问题修复 5 years ago
王杰 43ad04818c pom 5 years ago
王杰 0d256b3afd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 b4a4c42fe0 合并master代码 5 years ago
wynne1005 b3aa6eef70 中航 均值极差 5 years ago
钮海涛 35d3a85b60 合并master代码 5 years ago
钮海涛 c7adb56b9c Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 8d6b01c06e Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 3df3c89db9 Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 a52646a65d Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
 5 years ago
钮海涛 ea43d63d7e Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
汪云昊 dd75e3729b feat:添加条码解析校验模式 5 years ago
汪云昊 d02c73f431 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 26cf4c5e92 feat:mongo模块化 5 years ago
汪云昊 103137e2fc feat:添加条码解析校验模式 5 years ago
汪云昊 a5d7ff1ef4 feat:添加条码解析校验模式 5 years ago
王杰 3b31f9fcc8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 d0bfa965f7 类型信息 seq 5 years ago
陈思洁 b0c3b85378 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 68fef2b051 【2634 19048--涂装Unpack流程！-2020-08-05】 5 years ago
wynne1005 c3f30530a8 erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 086c78f828 新增pcn页面的辅助展示组件 5 years ago
puxiao.liao 6d59e00fc5 Fix bug#10545 
10545 19081 -- 出入库界面更改 20200814
 5 years ago
joke.wang e3146c9fb4 Fix Bug #0776 5 years ago
王杰 4c9b5d087c 涂装 二箱 客户 查询工作逻辑变更 5 years ago
王杰 a2084204f0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 41422d895e 涂装 客户 二箱 查询工单逻辑变更 5 years ago
puxiao.liao ba5befe291 Finish Task #2645 Cost:8h 
【PCR-20200525-003_委外出库条码变更】中的零件号转化
 5 years ago
joke.wang fd771bccf8 报功接口增加工单类型字段 5 years ago
joke.wang 6f2905de1a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang f6460749db jsp解析优化 5 years ago
曾贞一 d81a7bf22e 【接口映射优化】 5 years ago
joke.wang 84dcf36c86 Fix Bug #10708 5 years ago
陈思洁 d17161d359 【2658 LPS导入后端开发】 5 years ago
曾贞一 867ecc6d71 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 15314209ae 【2636 07 1.2.3.4.3坤泰ERP&WMS接口】 5 years ago
joke.wang f275d70136 Fix Bug #10674 5 years ago
puxiao.liao 9299f17c3b Fix bug#10671 
二维码收货扫描条码报错系统异常 --20200821
 5 years ago
陈思洁 358d582209 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b56cf991be 【2607 08 ext PCR-200623001需求变更-预组装】 5 years ago
王杰 5f495a1b98 产品工作中心配置 5 years ago
曾贞一 d3ae797ba0 【坤泰接口开发】 
【质保周期检查组件--优化代码】
 5 years ago
joke.wang 9207f20b37 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 09b8ccd1e3 Fix Bug #10520 5 years ago
王杰 1d86ce6429 总装打包 展示组件 列表显示封箱状态名称 5 years ago
陈思洁 406c625974 【2634 19048--涂装Unpack流程！】 5 years ago
陈思洁 c937e2aa64 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee927b7056 【2607 08 ext PCR-200623001需求变更-预组装】 5 years ago
宋军超 6db85d596b 修改海纳川问题 5 years ago
王杰 72afe6891b 料箱显示工作中心名称 5 years ago
rock.yu f1bbe0344b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 5bfd542402 增加工单拉动 5 years ago
宋军超 5e81b1f448 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 4d816de5da 修改海纳川问题,添加PTL新逻辑关联bug:10538 5 years ago
王杰 a7c3167eef 注塑上料 5 years ago
joke.wang 562ba3e339 增加按灯停机时长接口 5 years ago
曾贞一 0b09e410f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 fe2017fbe4 【622 08 1.2.2.2.6 BOM增加虚阶零件】 5 years ago
钮海涛 228d3dd2ab Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 841742e474 托标签收货合并到二维码收货 5 years ago
宋军超 163c385842 修改海纳川问题 5 years ago
puxiao.liao fde40074ce BUG修复 5 years ago
joke.wang 85b6067133 BI优化1 5 years ago
wynne1005 a400bf5aa7 还原orderBy 5 years ago
wynne1005 8ee28db80b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 887e1d04f7 baseBean sortParamMap 先注释 5 years ago
宋军超 ba7cdc84e5 修改海纳川问题 5 years ago
wynne1005 953e243fe8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 ef83a7aa08 是否重选更换名称 大小枪与绑定支持并发 5 years ago
钮海涛 9878547daa 合并dev分支代码 5 years ago
钮海涛 272c92dcb6 Merge remote-tracking branch 'origin/test' into test 5 years ago