Commit Graph
603 Commits
Author SHA1 Message Date
高嵩 798a3b5161 Merge branch 'dev_2nd_period' into 'feature_dev_20221010_extend'
# Conflicts:
#   jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
2022-10-24 10:09:49 +08:00
sunFlower a7f6a476e3 修改认证参数列表 2022-10-20 11:00:01 +08:00
刘彦泽 a0d1decb59 修改中英文翻译 2022-10-19 13:51:39 +08:00
sunFlower 94dad9ec77 对接待办中心 2022-10-18 15:17:03 +08:00
sunFlower 2dd540a03a 对接项目库 2022-10-18 10:01:17 +08:00
sunFlower 22c49f22c3 对接待办中心 2022-10-17 18:01:46 +08:00
sunFlower 2cbfb02ea6 布局项目库变更 2022-10-17 10:59:54 +08:00
zyx.net 396b58f892 待办中心 项目参数任务对接后端 2022-10-17 10:49:18 +08:00
sunFlower 5806e04bff 修改问题知识库 2022-10-14 17:36:16 +08:00
高嵩 abfa83aae0 合并分支 'dev_third_stage' 到 'feature_20221014_noLogo'
Dev third stage

查看合并请求 laws-nio/laws-weilai!189
2022-10-14 17:11:06 +08:00
刘彦泽 29061f9748 修改中英文翻译 2022-10-14 15:54:14 +08:00
刘彦泽 32ec7905a7 修改中英文翻译 2022-10-14 15:52:10 +08:00
sunFlower f1c3c67dd3 去掉、nio 2022-10-14 15:39:57 +08:00
刘彦泽 e6302aa444 修改中英文翻译 2022-10-14 15:35:05 +08:00
刘彦泽 5b48e3aac5 修改中英文翻译 2022-10-14 15:28:03 +08:00
sunFlower cc976709a5 布局项目库变更 2022-10-14 15:18:01 +08:00
sunFlower 9510b39db1 布局待办中心 2022-10-14 13:58:15 +08:00
sunFlower d118dcaad9 布局待办中心 2022-10-14 11:39:39 +08:00
sunFlower 4c0d8d6dd2 去掉nio 2022-10-14 10:31:44 +08:00
sunFlower 84c0dca152 布局待办中心 2022-10-14 10:19:54 +08:00
刘彦泽 6a9157d913 修改中英文翻译 2022-10-13 11:42:39 +08:00
刘彦泽 b988662436 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
# Conflicts:
#	jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
2022-10-13 10:38:54 +08:00
刘彦泽 772901c74a 修改中英文翻译 2022-10-13 10:36:26 +08:00
sunFlower ae7a9c7a62 修改禅道已知bug 2022-10-12 16:53:14 +08:00
sunFlower a6dae21469 修改禅道已知bug 2022-10-10 15:47:33 +08:00
sunFlower c906c35566 修改禅道已知bug 2022-10-10 10:22:01 +08:00
sunFlower c1a95d3539 修改禅道已知bug 2022-10-09 17:56:11 +08:00
sunFlower ac49267c7f 修改禅道已知bug 2022-09-30 11:53:50 +08:00
sunFlower 59e828a166 修改三期优化点 2022-09-29 14:10:45 +08:00
sunFlower 2c829d2860 修改三期优化点 2022-09-28 16:52:31 +08:00
sunFlower c19e32410e 1.修改三期优化点 2022-09-27 16:24:32 +08:00
sunFlower c39419061a 1.修改三期优化点 2022-09-27 11:26:55 +08:00
sunFlower 827afe009e 1.修改三期优化点 2022-09-26 09:23:58 +08:00
sunFlower 127e04110e 1.修改三期优化点 2022-09-23 09:29:14 +08:00
sunFlower 769bd811d4 1.修改三期优化点 2022-09-22 16:02:41 +08:00
sunFlower b7be83ac0e 1.修改三期优化点 2022-09-22 14:50:43 +08:00
sunFlower 91208e2438 1.修改三期优化点 2022-09-22 11:16:28 +08:00
sunFlower ffcc0b115d 1.修改三期优化点 2022-09-22 10:27:04 +08:00
sunFlower a87317f920 1.修改三期优化点 2022-09-21 17:38:32 +08:00
sunFlower 418dd15e4f 1.修改三期优化点 2022-09-21 15:34:00 +08:00
sunFlower 77f1cdd022 1.认证参数导出时增加文件名称输入 2022-09-19 14:27:22 +08:00
范强强 279f5cdb17 待办流程添加批量办理 2022-09-15 17:16:57 +08:00
zyx.net 96740e313e 上报库删除功能 2022-09-13 11:37:57 +08:00
范强强 8a7d667315 修改禅道已知bug 2022-09-08 20:27:56 +08:00
范强强 79c5c228e8 对接法规意见收集、法规技术评估的删除 2022-09-08 13:48:16 +08:00
范强强 d6fbd52e1a 法规清单添加任务确认驳回原因 2022-09-06 11:57:50 +08:00
范强强 08199886b9 添加消息类型 2022-09-02 11:34:58 +08:00
肖文钰 431c007110 Merge branch 'master' into 'dev_third_stage'
# Conflicts:
#   jero-web/src/common/lang/zh-cn.js
#   jero-web/src/views/projectManagement/components/listOfRegulations.vue
2022-08-24 20:05:13 +08:00
qq787203167 6c8decb9b3 修改禅道已知问题 2022-08-24 10:58:07 +08:00
肖文钰 3fa5e31e2a Merge branch 'master' into 'fix_bug_first_stage'
# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
2022-08-24 10:15:59 +08:00