Commit Graph
3355 Commits
Author SHA1 Message Date
肖文钰 acb5a0098d 合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!91
2022-07-15 22:08:29 +08:00
肖文钰 5d45d9aa9d 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!90
2022-07-15 22:08:07 +08:00
liyawei ab8649fe35 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-15 18:37:30 +08:00
liyawei 0640a5a102 people-同步用户bug修改 2022-07-15 18:37:13 +08:00
wangzhijiang 15d51b0d0c Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-15 18:33:31 +08:00
wangzhijiang ece28554de 法规符合性看板-查询接口。 2022-07-15 18:33:12 +08:00
qq787203167 54e23f4bc4 修改收集清单的责任领域 2022-07-15 17:57:13 +08:00
liyawei 04af7768ea people-同步用户bug修改 2022-07-15 17:36:24 +08:00
liyawei d02f510924 认证-参数项收集-变更:责任领域bug修改 2022-07-15 17:30:08 +08:00
liyawei b2e3a1b866 认证-参数项-编号校验添加小数点左斜杠空格 2022-07-15 17:10:04 +08:00
zhn 52ef4db730 修改字段类型 2022-07-15 16:54:04 +08:00
wangzhijiang e1fa0a5443 update 2022-07-15 16:49:55 +08:00
qq787203167 8d55d488e4 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-15 16:34:45 +08:00
qq787203167 1e4eac791a 修改法规技术评估接口 2022-07-15 16:34:29 +08:00
zyx.net 0f2e15e8d5 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-15 16:33:39 +08:00
zyx.net 9e36b04f8b 认证管理-参数项列表-新增,编辑 参数名称校验修改 2022-07-15 16:33:09 +08:00
wangzhijiang 21b9078596 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-15 16:31:48 +08:00
wangzhijiang f515bb8ef4 update 2022-07-15 16:31:31 +08:00
zyx.net a1eaacd95b Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-15 16:21:56 +08:00
zyx.net b87288c9d1 认证管理-参数项列表-新增,编辑 编号校验修改 2022-07-15 16:18:56 +08:00
qq787203167 28d9dac6c2 修改法规技术评估接口 2022-07-15 15:51:41 +08:00
qq787203167 055f6c14bc 修改法规技术评估接口 2022-07-15 15:14:45 +08:00
qq787203167 384a8ab6c5 修改英文大小写 2022-07-15 15:04:06 +08:00
肖文钰 1e68b36a9e 合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!89
2022-07-15 14:46:20 +08:00
肖文钰 54fa10952c Merge branch 'master' into 'fix_bug_first_stage'
# Conflicts:
#   jero-web/src/common/lang/en-us.js
2022-07-15 14:45:29 +08:00
wangzhijiang 226e5e165f 法规技术评估-根据文档库id,查询文档库数据接口。 2022-07-15 14:31:45 +08:00
肖文钰 57d3593826 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!87
2022-07-15 14:25:55 +08:00
wangzhijiang dffe45c58b 回滚根据id查询文档库列表代码。 2022-07-15 14:19:50 +08:00
qq787203167 181c04410c 修改文档拆分布局问题 2022-07-15 14:11:13 +08:00
qq787203167 e44d653e5b 修改文档拆分布局问题 2022-07-15 13:49:18 +08:00
zyx.net 1d576bc57c Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-15 13:37:36 +08:00
zyx.net adc59505dc 英文首字母大写 2022-07-15 13:37:05 +08:00
xiaowenyu 81f79f6d1e 修改sql文件,标注已同步正式环境 2022-07-15 13:31:32 +08:00
xiaowenyu 19f7ee2f6d 修改sql文件,标注已同步正式环境 2022-07-15 13:29:44 +08:00
zyx.net 302ee3fb2d Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-15 11:30:58 +08:00
zyx.net 34b32a3057 法规符合性看板页面布局 2022-07-15 11:28:17 +08:00
lixuetao f94ead44bc 一部分英文调整中英文大写的问题 2022-07-15 11:12:00 +08:00
qq787203167 84e9cea1af 对接法规技术评估 2022-07-15 11:05:25 +08:00
qq787203167 865e5ce63b 通过id查找数据 2022-07-15 10:41:54 +08:00
wangzhijiang a0906e88de 法规技术评估-针对标准发起流程时,需要通过id查询文档库数据,过滤出来文档库id查询条件。 2022-07-15 10:07:13 +08:00
liyawei 8d810fe674 people-用户表删除部分索引 2022-07-15 09:26:17 +08:00
肖文钰 2450ea011a 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!86
2022-07-14 20:15:04 +08:00
肖文钰 6d56045d6c 合并分支 'fix_bug_first_stage' 到 'master'
修改禅道已知bug

查看合并请求 laws-nio/laws-weilai!85
2022-07-14 20:14:51 +08:00
liyawei 4b68f8ddf3 people-用户同步bug修改 2022-07-14 18:58:06 +08:00
liyawei b2af5ace67 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-14 18:30:55 +08:00
liyawei dccc534f74 people-用户同步bug修改 2022-07-14 18:27:01 +08:00
wangzhijiang e341058059 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-14 18:14:36 +08:00
wangzhijiang 832b866eec update 2022-07-14 18:14:06 +08:00
wangzhijiang 933335d491 法规技术评估-接口完善。 2022-07-14 18:13:48 +08:00
qq787203167 16df363276 修改禅道已知bug 2022-07-14 17:52:35 +08:00