Commit Graph
154 Commits
Author SHA1 Message Date
qq787203167 04556d1610 修改已知bug 2022-08-05 17:17:10 +08:00
qq787203167 fccf1cbf6a 修改禅道已知bug 2022-08-04 17:50:00 +08:00
qq787203167 ed5ed29233 修改禅道已知bug 2022-08-04 17:17:15 +08:00
肖文钰 2450ea011a 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!86
2022-07-14 20:15:04 +08:00
qq787203167 87cab0fa11 对接法规技术评估 2022-07-14 15:56:43 +08:00
肖文钰 a2acf30d9b 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!83
2022-07-14 15:38:23 +08:00
wangzhijiang 6ed3c8f2e6 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-14 11:09:57 +08:00
wangzhijiang d7be39abe6 法规技术评估对接。
法规技术评估到达截止日期定时器。
2022-07-14 11:09:30 +08:00
qq787203167 860270eba8 对接法规技术评估 2022-07-14 11:05:33 +08:00
wangzhijiang 0cca632e44 法规技术评估-条款信息评估结果表-列表查询完善。 2022-07-13 18:48:19 +08:00
qq787203167 6286549c8c 对接法规技术评估 2022-07-13 18:36:45 +08:00
qq787203167 5d519167c1 对接法规技术评估 2022-07-13 18:16:56 +08:00
qq787203167 4877c3706d 对接法规技术评估 2022-07-13 17:33:48 +08:00
qq787203167 b3dd749d8e 对接法规技术评估 2022-07-13 16:22:43 +08:00
qq787203167 cfd49b795e 布局法规技术评估 2022-07-13 11:31:02 +08:00
李雪涛 128c501e19 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!78
2022-07-12 15:19:56 +08:00
qq787203167 060be76901 修改已知问题 2022-07-12 14:19:22 +08:00
qq787203167 3fb138e2dc 修改已知问题 2022-07-12 11:41:59 +08:00
qq787203167 772a314b3a 布局法规技术评估\ 2022-07-12 11:01:43 +08:00
qq787203167 8a32f6f74c 布局法规技术评估 2022-07-12 09:41:01 +08:00
李雪涛 9233ca39b9 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!76
2022-07-12 09:35:02 +08:00
qq787203167 348ef36676 法规技术评估布局 2022-07-11 17:41:56 +08:00
qq787203167 077d81da5d 修改禅道已知bug 2022-07-11 17:16:45 +08:00
zer0Black da4e6c8011 Merge branch 'dev_third_stage'
# Conflicts:
#	jero-web/src/components/PersonnelSelection/index.vue
2022-07-09 11:16:08 +08:00
qq787203167 4524f45031 修改禅道已知bug 2022-07-08 14:40:54 +08:00
qq787203167 bee6d6367c 修改禅道已知bug 2022-07-08 11:25:58 +08:00
qq787203167 f90fe16a43 修改禅道已知bug 2022-07-07 11:10:13 +08:00
qq787203167 67804675bd 对接法规意见收集 2022-07-06 17:11:30 +08:00
qq787203167 76f5443543 对接法规意见收集 2022-07-06 16:41:51 +08:00
qq787203167 ad697d08a4 对接法规意见收集 2022-07-06 16:21:51 +08:00
qq787203167 785476c50c 对接法规意见收集 2022-07-06 15:48:09 +08:00
qq787203167 5ae26a957d 对接法规意见收集 2022-07-06 15:05:47 +08:00
qq787203167 24d45655da 对接法规意见收集 2022-07-06 14:38:38 +08:00
lixuetao 4b092fc07c Merge branch 'fix_bug_first_stage'
# Conflicts:
#	jero-web/src/components/CollectionType/index.vue
2022-07-05 19:48:17 +08:00
qq787203167 9f8aac7cfa 修改禅道bug 2022-07-05 16:55:39 +08:00
qq787203167 ba1a751ee4 修改禅道bug 2022-07-05 16:19:55 +08:00
lixuetao 7ddac7eb75 Merge branch 'dev_third_stage'
# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
2022-07-05 15:34:57 +08:00
qq787203167 818a45b0ac 修改禅道bug 2022-07-05 14:56:59 +08:00
qq787203167 14b1a68428 修改禅道bug 2022-07-05 14:17:13 +08:00
qq787203167 293781a685 修改禅道bug 2022-07-04 17:00:13 +08:00
qq787203167 e283a17dd1 修改禅道bug 2022-07-04 15:45:28 +08:00
qq787203167 44d0f740fd 修改禅道已知bug 2022-07-02 12:23:36 +08:00
qq787203167 1912f76fc2 修改禅道已知bug 2022-07-01 18:10:37 +08:00
qq787203167 b0178526e2 修改禅道已知bug 2022-07-01 16:41:40 +08:00
zer0Black a696406651 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/components/uploadFileChangeDown/file.vue
2022-07-01 15:12:31 +08:00
qq787203167 47f23eabe4 修改禅道已知bug 2022-07-01 14:23:08 +08:00
qq787203167 080c6b14c7 修改禅道已知bug 2022-06-30 16:58:19 +08:00
qq787203167 0cc54920dd 修改禅道已知bug 2022-06-27 16:50:30 +08:00
qq787203167 759cb52e57 修改禅道已知bug 2022-06-23 16:55:41 +08:00
qq787203167 28db9e0daf 布局法规意见收集 2022-06-23 11:39:19 +08:00