963 Commits (490cac6ecb1bc237376f8e08c7cbb63c782bf578)

Author SHA1 Message Date
dengyu 33e69fb7df Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
dengyu fcd09074a6 20240929 3 months ago
jianghaiqing df6dbb910f 修改舱位生成订舱 3 months ago
cjy 9eb0c1cf7d 海运出口拆出生成海运订单接口 3 months ago
zhangxiaofeng 2a7cb676c8 支持审核的任务类型排除非工作流创建的任务 3 months ago
jianghaiqing b4df120039 修改订单保存,增加日志 3 months ago
cjy f81d6818b8 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy a6e31cea1b 自动推送货物状态 3 months ago
zhangxiaofeng 30e2478480 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 6a7e9ad2f9 通过任务台创建,而非通过工作流创建的任务类型,需手动调用函数来创建驳回任务,且重新提交时不创建工作流 3 months ago
cjy 33a0c76a8b 添加退舱确认任务 3 months ago
cjy f2a93a501f 发起退舱修改 3 months ago
cjy a7af0771b5 退舱任务审核修改 3 months ago
cjy 02811f006c Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 0d9b550768 退舱部分 3 months ago
zhangxiaofeng 0aeeae948e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 86db4bdc60 删除订单前判断是否存在关联任务 3 months ago
cjy 8c988914d8 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 9325d06ffa 任务完成或取消前判断当前登陆人是否为所选任务的处理人 3 months ago
cjy 241bd4b9d3 海运出口改配相关 3 months ago
cjy 067a1c2a6b 海运出口添加危险品联系人及电话 3 months ago
cjy 3108a2ddd8 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 72398d7280 退舱 3 months ago
嵇文龙 3e94af255f 附件名支持razor解析 3 months ago
cjy 3a80384b9e 修改 3 months ago
cjy bea0c05697 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 054a09f8df 海运退舱部分及汇率设置修改 3 months ago
jianghaiqing b7f2453e2f 修改VGM 3 months ago
jianghaiqing 41245723ec 修改VGM
VOLTA增加提单号不能大于10位的验证
3 months ago
jianghaiqing 2a2e4499ef 修改获取VGM发送通道选项 3 months ago
jianghaiqing 3e44ff2eb4 新增VGM检查 3 months ago
jianghaiqing b9b975b5ed Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 0611f14056 修改VOLTA 3 months ago
zhangxiaofeng fc5ad9bdb7 任务台下属任务 3 months ago
cjy 719ac059bc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 247f83f542 海运出口业务状态修改 3 months ago
jianghaiqing 032fee1d83 修改VOLTA 3 months ago
zhangxiaofeng 478549a793 BusinessStatus长度 3 months ago
zhangxiaofeng 01d177e003 补充 3 months ago
zhangxiaofeng a783ba49af Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 6c118d52a1 货物状态更新时保存编码 3 months ago
jianghaiqing f828c87051 修改VOLTA 3 months ago
jianghaiqing aeaf76016b 修改VOLTA 3 months ago
jianghaiqing 7a1764a184 修改VOLTA 3 months ago
jianghaiqing e00efe4fdc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 405f7bf73d 新增VOLTA的EDI订舱、截单
增加订单保存事务日志
3 months ago
cjy bb1bd8e7d5 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 80436fc32a 数据权限修改及海运出口新增委托编号有值不生成编号 3 months ago
嵇文龙 85b90935e9 获取开票分页列表更改数据结构 3 months ago
嵇文龙 4e3738845e 海运出口任务增加撤销 3 months ago
jianghaiqing 5cd89bd7d1 修改截单判断 3 months ago
cjy 39db6f1d1e 海运出口编码规则按开船日期取值 3 months ago
cjy 693f960b56 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 63f695c5ef 放舱派车信息修改 3 months ago
嵇文龙 c38d45a872 任务存在提示 3 months ago
嵇文龙 da05ffac25 任务审核自动通过 3 months ago
嵇文龙 9910d4e0db 增加登录账号显示 3 months ago
dengyu 085d259861 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
dengyu 5d71602d45 增加单程租入模块 3 months ago
嵇文龙 d017c9a989 邮件模板联系人座机取值更改为OfficePhone 3 months ago
嵇文龙 25890ca948 邮件模板联系人信息获取bug 3 months ago
嵇文龙 35e010734b 审核类任务返回错误提示 3 months ago
cjy 864d808921 海运出口保函打印修改 3 months ago
jianghaiqing 269d186fd7 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
嵇文龙 4f99e0f24c 发票申请单增加状态显示文本 3 months ago
jianghaiqing 48f1b8fd61 修改INTTRA订舱 3 months ago
jianghaiqing b0809a1479 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing c4b5c5f6fc 增加订舱集装箱校验 3 months ago
嵇文龙 ca08acb5d3 增加2种费用报表 3 months ago
cjy 320358c7b9 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 73a602490d 海运出口列表可视数据权限实现 3 months ago
jianghaiqing dfd4820264 修改亿通截单 3 months ago
jianghaiqing 102f618619 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 6045af7cf6 修改亿通截单 3 months ago
嵇文龙 ff0a271a64 审核任务驳回时更新驳回理由 3 months ago
jianghaiqing 9f6cfa81b3 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 05f94b4d13 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 83613772c5 修改ONE的YT截单 3 months ago
嵇文龙 ce9fb01862 工作GetNextConditionNodeId方法bug修复 3 months ago
嵇文龙 a96d8022ac 命名空间冲突解决 3 months ago
jianghaiqing 1295a6b100 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 782136f26b 修改易通截单 3 months ago
cjy d166f870cc 回写商品信息修改 3 months ago
cjy 1d2e94eb94 海运出口日志结构修改 3 months ago
cjy 313c3633d6 海运出口保存回写商品信息 3 months ago
cjy d07e0abb2e 复制单据单号重新赋值修改 3 months ago
cjy fec26482a2 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 758f2d71cd 可视数据权限调整 3 months ago
嵇文龙 a2d70cc517 批量创建关联任务存在时返回提示 3 months ago
嵇文龙 a7c0fa68de 增加用于发送邮件的任务动作 3 months ago
嵇文龙 0dbc57ca25 二次提交审核bug修复 3 months ago
嵇文龙 f2c67d6b80 撤销后审核bug 3 months ago
cjy 5ae607af2e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy ea02724b8c 数据权限修改,优化字段、列表初始化权限、指定权限范围等;获取机构用户树;海运出口复制单号处理;角色代码唯一判断修改;合约号下拉添加船公司传值 3 months ago
zhangxiaofeng 13d213faed Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 8f3025b6d4 任务台台账相关 3 months ago
jianghaiqing 13144a9ae6 修改INTTRA 3 months ago
jianghaiqing 13f9a7bcfe Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 5ea350f6d0 修改INTTRA 3 months ago
cjy 2822c8a5cc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 06e30198b8 海运出口复制单据单号重新赋值 3 months ago
嵇文龙 a0b486dae1 根据业务ID和类型获取模板所需数据 3 months ago
cjy 602ff7a527 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 5078e44e4b 提单差异修改 3 months ago
嵇文龙 b0320c3903 已使用的往来单位不更新简称 3 months ago
cjy 22b21338f5 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 5dbc63b619 海运出口提单修改 3 months ago
jianghaiqing c835db87c6 修改INTTRA 3 months ago
jianghaiqing 3aa2e8f45f Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 2e7c9e4926 修改INTTRA EDI 3 months ago
嵇文龙 d9bda89dba 批量创建关联任务 3 months ago
嵇文龙 9e6fca5480 邮件模板bug修复 3 months ago
jianghaiqing 98fe643efb 修改发送订舱校验 3 months ago
cjy 0222f6a240 揽货人下拉添加来源及来源明细 3 months ago
jianghaiqing b49cc048e9 修改同步东胜功能 3 months ago
jianghaiqing 88a4bab957 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing d4b6c7872f 新增订单扩展状态表 3 months ago
cjy 246a765131 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy a59921842c 海运出口处理订单联系人添加国内发货人 3 months ago
嵇文龙 0098fd8e60 往来单位增加若干字段 3 months ago
cjy 0c3fd95f86 订单编号根据揽货人编号生成 3 months ago
jianghaiqing d6d41ec659 修改BC 3 months ago
jianghaiqing 690aa31b9d 1、新增同步东胜7功能
2、修改BC拆单转发功能
3 months ago
嵇文龙 d0a0aac21e 邮件数据获取bug 3 months ago
嵇文龙 1e366e6c93 邮件数据获取bug 3 months ago
嵇文龙 b3005d8fdf 提交错误修复 3 months ago
zhangxiaofeng f106af5af7 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng bcb795fc18 合约管理:合约与航线改为一对多的关系 3 months ago
嵇文龙 c3de27b7b0 根据业务ID和类型获取模板所需数据 3 months ago
cjy ce575d9899 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 4efe898c50 设置货物状态修改 3 months ago
zhangxiaofeng 9514fd670e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 9ae873a954 任务转交调整 3 months ago
cjy 029a64e18e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy c6ec025950 海运出口添加录入人 3 months ago
jianghaiqing 8415bacb2d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 125b643e83 修改 Booking Amendment MSK自动转发功能 3 months ago
zhangxiaofeng d4f4d85be4 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 1176796cea BC处理流程调整 3 months ago
嵇文龙 57e274f643 邮件模板配置服务增加渲染模板内容 3 months ago
jianghaiqing 42bb1ea8e8 新增Booking Amendment邮件转发模板 3 months ago
jianghaiqing 5212151b7c 修改舱位引入 3 months ago
jianghaiqing e6871845a1 1 3 months ago
jianghaiqing 5f6c66c0ff 修改舱位引入功能 3 months ago
cjy da87e104b0 提箱小票修改 3 months ago
嵇文龙 85ec4ed040 编辑邮件模板不能保存附件设置的bug 3 months ago
嵇文龙 c30a9c356e 邮件模板配置编辑bug修复 3 months ago
zhangxiaofeng 3d1044443d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 00ee9f7fd1 任务台委托编号字段名称调整 3 months ago
嵇文龙 a6322caf55 发票申请bug修复 3 months ago
cjy e8d8692142 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 76b05e5879 定时任务修改;海运出口添加服务项目 3 months ago
zhangxiaofeng 5131013463 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 55d80e23de 创建任务时如果接收人为空,则公共任务 3 months ago
嵇文龙 921d429663 取消任务限制必须配置接收人的判断 3 months ago
嵇文龙 ed44adf7a5 取消TransferTask的内部事务 3 months ago
嵇文龙 1ae10692a6 解除任务服务引用费用相关服务,引起autofac循环引用的问题 3 months ago
cjy 395ff4862f Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 1b41d79758 海运出口处理订单联系人删除非关联单位联系人;用户管理是否允许使用本系统字段相关修改,登录限制、用户授权数量限制等 3 months ago
嵇文龙 1a7971de73 费用/整单审核、费用修改/删除与任务台联动 3 months ago
cjy 2c47ba63ee 海运出口联系人添加手机号字段及相关修改 3 months ago
嵇文龙 b15888f55b 往来单位银行与发票抬头合并提交 3 months ago
嵇文龙 fbb501e8ac 将部分动作执行的错误信息写入任务台描述 4 months ago
jianghaiqing acff0e22a1 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing f1e99c8309 修改截止时间变更任务 4 months ago
cjy c30289dc28 合并代码 4 months ago
cjy 38fa586135 提箱小票及VGM链接定时任务 4 months ago
jianghaiqing b58b080193 修改截止时间 4 months ago
jianghaiqing 0eda571a68 修改截止时间变更 4 months ago
jianghaiqing 73c13584cd 修改截止时间任务 4 months ago
jianghaiqing 8a0ccbe51a 新增截止时间任务模板 4 months ago
嵇文龙 f92a05efc6 邮件发送服务增加主库租户过滤器 4 months ago
cjy 9f31c36233 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy dc91725a23 海运出口列表添加订舱状态 4 months ago
嵇文龙 3e988102e6 费用记录生成调整 4 months ago
嵇文龙 91476617ec 修复二次创建任务时,未更新任务状态的bug 4 months ago
嵇文龙 536bc8ae0e 修复重复任务判断 4 months ago
嵇文龙 0c963aa354 重复创建任务问题修复 4 months ago
嵇文龙 9bd5dac7c1 工作流撤销bug修复 4 months ago
jianghaiqing b815f26c47 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 2d29138319 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
嵇文龙 f9724d9694 创建关联任务bug修复 4 months ago
cjy aed6dcb2f0 膝盖缓存 4 months ago
jianghaiqing 4067ac5fe5 修改任务 4 months ago
嵇文龙 547bf3ae02 邮件模板增加共享 4 months ago
嵇文龙 1697824c66 任务审核批量提交与任务 4 months ago
jianghaiqing a690f76c47 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 80afdea02d 修改扣费 4 months ago
cjy 9055417cbb Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 81600c7db2 定时任务框架部分及运踪订阅修改 4 months ago
jianghaiqing 122531e857 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 3ae47d212f 新增扣费 4 months ago
嵇文龙 a0c470b932 任务类型替换 4 months ago
嵇文龙 e8d5aa7af4 提交 4 months ago
嵇文龙 1db3a62193 工作流审核类型重命名 4 months ago
嵇文龙 408c8dbae4 冲突合并 4 months ago
嵇文龙 972d8d93a9 任务台支持全部审核类型 4 months ago
cjy d8eb24f7e9 海运出口运踪船公司映射修改 4 months ago
cjy d153cd9adc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 254e5356a3 往来单位添加所属机构名称字段 4 months ago
zhangxiaofeng 6d0bf073ac 创建任务时,保存提单号和委托编号 4 months ago
cjy 9b23876ab7 集装箱添加排序号;收发通模板接口添加往来单位收发货人信息 4 months ago
嵇文龙 4209b90845 更新费用默认人民币代码为RMB 4 months ago
cjy 57e6b9682d 放舱详情修改添加获取订单委托单位联系 4 months ago
jianghaiqing dee67a99cb 修改任务 4 months ago
嵇文龙 5dfc6d5957 自动订舱bug修复 4 months ago
嵇文龙 587ef612dc 任务日志描述修正 4 months ago
zhangxiaofeng 5730c4cfa5 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
zhangxiaofeng f3cd9b0d59 设置任务状态方法拓展 4 months ago
嵇文龙 bcf0902a9d 更改调用方法 4 months ago
嵇文龙 b887912827 更改任务动作执行调用 4 months ago
cjy e8defab35c 海运出口箱型箱量更新修改 4 months ago
zhangxiaofeng a7d007f96c 确保任务交互模块已授权EnsureModuleAuthorized方法添加租户Id条件 4 months ago
cjy d9909790c7 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy eb63979af0 海运出口发送放舱通知、客户收发货人类型修改 4 months ago
zhangxiaofeng d90258eb2c 租户Id取值方式调整 4 months ago
jianghaiqing 700cfe4699 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 1b34462320 修改VOLTA订舱 4 months ago
zhangxiaofeng dc3c9a7969 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
zhangxiaofeng 173fc6e75d TaskService确保任务交互模块已授权Where条件调整 4 months ago
cjy cfd469154e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy c228518869 海运出口放舱通知修改 4 months ago
嵇文龙 f0bf2eab16 屏蔽审单后生成费用 4 months ago
嵇文龙 c52728c5a4 自动订舱bug修复 4 months ago
嵇文龙 2c17f3bd38 根据业务ID与类型生成费用 4 months ago
嵇文龙 282f876afc 费用模板 4 months ago
jianghaiqing 74871292d2 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing ad5299a7c6 修改箱型映射、签单方式映射、MSK API订舱 4 months ago
dengyu 60e25f7966 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
dengyu 4d27ccca97 20240826 箱管 4 months ago
jianghaiqing 83197134a1 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 2810ba2763 修改包装映射编辑 4 months ago
cjy 012fed5808 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 53387b2202 海运出口放舱通知部分修改 4 months ago
jianghaiqing 4a2b59c145 修改MSK API 4 months ago
jianghaiqing fc9c99d59c 修改MSK API订舱,增加定时订舱 4 months ago
jianghaiqing db06c45497 修改INTTRA 4 months ago
jianghaiqing c76c47d64c Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing f1e343a301 修改INTTRA 4 months ago
嵇文龙 1d393f4e74 发送EDI失败时的参数记录 4 months ago
嵇文龙 999e2ac164 GetNextTypeAsync的现舱参数设置 4 months ago
嵇文龙 1547cb915c 获取给定任务的下一任务类型 4 months ago
嵇文龙 7f3a68b011 创建任务增加是否现舱参数值 4 months ago
嵇文龙 37bc0e01a9 触发自动订舱 4 months ago
jianghaiqing c18a3b133b 修改舱位引入 4 months ago
jianghaiqing 109229d500 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing af42341d5b 修改引入舱位 4 months ago
cjy 41b6fb665d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy b8a7c5a84b 箱型二级缓存 4 months ago
jianghaiqing 1d1fe337af Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago