Commit Graph
2288 Commits
Author SHA1 Message Date
zyx.net 196d5a24dc 用户管理 编辑 2022-11-16 14:22:02 +08:00
zyx.net afb50c3fa9 用户管理修改 2022-11-16 11:21:09 +08:00
sunFlower 4bc4f6144c 修改任务清单的参数 2022-11-14 13:43:19 +08:00
sunFlower dc967e7066 首页流程跳转 2022-11-11 10:37:03 +08:00
刘彦泽 6d5026b320 修改中英文翻译 2022-11-10 20:38:57 +08:00
刘彦泽 ce03a575f6 修改中英文翻译 2022-11-10 16:40:25 +08:00
刘彦泽 bfe7b3974a 修改中英文翻译 2022-11-10 16:19:49 +08:00
sunFlower 6eaba7770f 添加按钮权限 2022-11-09 17:28:27 +08:00
sunFlower 92618c37b8 修改消息标题展示
法规预警增加跳转文档库
2022-11-09 13:50:03 +08:00
liyawei 7671e43ac2 待办中心-认证参数-bug修改 2022-11-09 11:03:50 +08:00
高嵩 5d9b1951df 修改优化点 2022-11-04 17:56:03 +08:00
高嵩 c21936171c 修改文档拆分详情左侧树的弹框输入框大小 2022-11-04 17:31:50 +08:00
sunFlower 7e63cb8a4a 修改禅道已知bug 2022-11-04 17:17:56 +08:00
sunFlower 37be68ce2c 修改禅道已知bug 2022-11-04 17:04:20 +08:00
sunFlower d337500e79 修改禅道已知bug 2022-11-04 13:45:27 +08:00
zyx.net 314e9a9657 Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-04 13:41:17 +08:00
zyx.net 3cacb86a8b 项目详情-认证参数列表中清单编辑去掉可以修改模板 2022-11-04 13:39:31 +08:00
sunFlower c52d46e4e8 修改禅道已知bug 2022-11-04 11:54:58 +08:00
sunFlower bc979d9c8e 修改禅道已知bug 2022-11-04 11:41:01 +08:00
sunFlower d53a5289d2 修改禅道已知bug 2022-11-04 09:23:18 +08:00
高嵩 aed6f23880 合并代码 2022-11-03 15:32:47 +08:00
787203167 9fd21f787b 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!233
2022-11-03 14:41:59 +08:00
787203167 0058770d36 Merge branch 'dev_2nd_period_test' into 'feature_dev_20221008_TODO'
# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
2022-11-03 14:41:16 +08:00
787203167 a26bae373e Merge branch 'dev_2nd_period_test' into 'dev_third_stage'
# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
#   jero-web/src/views/projectManagement/components/TaskList.vue
#   jero-web/src/views/projectManagement/components/cuibanModel.vue
2022-11-03 14:39:38 +08:00
高嵩 3f7ad00c1d Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'
# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
2022-11-03 14:32:08 +08:00
zyx.net 079a49ee5d 参数项收集清单导入导出修改 2022-11-03 10:41:44 +08:00
zyx.net 5abbf14407 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-11-03 09:53:28 +08:00
zyx.net bed54d7869 参数项列表新增 控件备选值不能输入!和# 2022-11-03 09:52:37 +08:00
liyawei 67b18a48a4 待办中心-认证参数-查询优化,添加待办标记 2022-11-02 19:53:12 +08:00
zyx.net abe7dcafaa 参数收集待办任务跳转修改 2022-11-02 18:16:04 +08:00
CD 847d5ec527 1、定时器分页有问题 暂时先改成这样 用于测试
2、消息全部处理完毕
2022-11-02 17:02:55 +08:00
sunFlower ca82a088eb 修改禅道已知bug 2022-11-02 15:29:54 +08:00
zyx.net 53bae2d6d1 任务清单增加催办错误提示 2022-11-02 11:44:41 +08:00
zyx.net 7ae9f2de69 任务清单增加催办功能 2022-11-02 10:46:32 +08:00
zyx.net c145f18ad1 任务清单增加催办功能 2022-11-02 10:08:41 +08:00
zyx.net 38e8f211d6 任务清单增加催办功能 2022-11-02 09:16:28 +08:00
高嵩 632af0d148 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!227
2022-11-02 09:08:16 +08:00
高嵩 cf6a9fa0cd 合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage

查看合并请求 laws-nio/laws-weilai!226
2022-11-02 09:07:54 +08:00
sunFlower bc8ca6e924 修改禅道已知bug 2022-11-01 16:54:22 +08:00
sunFlower f68a375893 修改禅道已知bug 2022-11-01 16:41:21 +08:00
zyx.net e1430d1413 填写人导出搜索条件修改 2022-11-01 16:35:57 +08:00
sunFlower 81c9c76fb0 修改禅道已知bug 2022-11-01 16:12:53 +08:00
sunFlower 2e798e417a 修改禅道已知bug 2022-11-01 15:59:37 +08:00
sunFlower 923e099599 修改禅道已知bug 2022-11-01 15:36:11 +08:00
sunFlower 691af95e43 修改禅道已知bug 2022-11-01 14:45:05 +08:00
zyx.net adf6801f67 Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into feature_dev_20221010_extend 2022-11-01 14:39:15 +08:00
zyx.net 56e7c0e8ee 填写人填写--控件类型为文本,控件校验为中文的,填写时没有字符长度限制 2022-11-01 14:38:40 +08:00
sunFlower 2214853d6a 修改禅道已知bug 2022-11-01 14:26:45 +08:00
sunFlower 58efb3b360 修改禅道已知bug 2022-11-01 14:14:54 +08:00
sunFlower fc16d2328a 修改禅道已知bug 2022-11-01 12:07:21 +08:00