Commit Graph
534 Commits
Author SHA1 Message Date
lixuetao af9bd856a3 Merge branch 'dev_third_stage' 2022-07-05 19:49:26 +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 ad8ea8a7f1 修改禅道bug 2022-07-05 18:18:36 +08:00
qq787203167 5a5958c1b1 修改禅道bug 2022-07-05 17:50:52 +08:00
zyx.net 84a1825fe9 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-05 17:33:35 +08:00
zyx.net 508da80794 上报库管理-参数项查看-自定义导出 2022-07-05 17:32:41 +08:00
qq787203167 c3b28cee61 修改禅道bug 2022-07-05 17:23:56 +08:00
qq787203167 58f07de7bd 修改禅道bug 2022-07-05 17:14:25 +08:00
qq787203167 c517fbe1ea 修改禅道bug 2022-07-05 17:11:16 +08:00
qq787203167 b29e8bc63a 修改禅道bug 2022-07-05 16:49:47 +08:00
qq787203167 172df9a539 修改禅道bug 2022-07-05 15:48:43 +08:00
qq787203167 345ca85963 修改禅道bug 2022-07-05 14:41:39 +08:00
qq787203167 5c61f76e62 修改禅道bug 2022-07-05 14:35:43 +08:00
qq787203167 cccea320d0 修改禅道bug 2022-07-04 18:03:10 +08:00
zyx.net 0f5b9f6989 上报库管理-导出历史对接接口 2022-07-04 17:43:54 +08:00
zyx.net 26c370b3cd Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-04 16:28:48 +08:00
zyx.net e8b98d0d90 上报库管理-参数项查看页与后端联调
上报库管理-参数项查看页-常规导出与后端联调
2022-07-04 16:27:58 +08:00
qq787203167 e283a17dd1 修改禅道bug 2022-07-04 15:45:28 +08:00
qq787203167 3f91811690 修改禅道已知bug 2022-07-04 11:38:14 +08:00
qq787203167 0df8425cbd 修改禅道已知bug 2022-07-04 10:42:59 +08:00
李雪涛 4f64aa951c 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!39
2022-07-03 12:41:20 +08:00
qq787203167 d3b8ee15dd 修改禅道已知bug 2022-07-02 17:57:21 +08:00
qq787203167 a0ca2ef27d 修改禅道已知bug 2022-07-02 17:08:15 +08:00
qq787203167 7ac2a56db7 修改禅道已知bug 2022-07-02 16:59:50 +08:00
qq787203167 ddd925097c 修改禅道已知bug 2022-07-02 16:46:59 +08:00
qq787203167 9d20350ef5 修改禅道已知bug 2022-07-02 16:35:40 +08:00
zyx.net 1301126d53 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-02 16:33:14 +08:00
zyx.net 3af51c1bff 参数收集清单 法规工程师选择增加删除按钮 2022-07-02 16:32:53 +08:00
qq787203167 090a26c2e8 修改禅道已知bug 2022-07-02 15:55:34 +08:00
qq787203167 178115e28e 修改禅道已知bug 2022-07-02 15:48:26 +08:00
zyx.net 58b2c9ac31 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-02 15:33:05 +08:00
zyx.net ab0081166e 修改禅道bug 2022-07-02 15:32:45 +08:00
qq787203167 614d99a5e1 修改禅道已知bug 2022-07-02 15:23:43 +08:00
zer0Black 19cef7e0ac 用户名补充上 2022-07-02 14:41:03 +08:00
qq787203167 a1b453f82d 修改禅道已知bug 2022-07-02 14:23:57 +08:00
qq787203167 f163558c0c 修改禅道已知bug 2022-07-02 14:19:03 +08:00
qq787203167 6d70cc7e90 修改禅道已知bug 2022-07-02 13:57:11 +08:00
qq787203167 50003ad6f5 修改禅道已知bug 2022-07-02 12:19:30 +08:00
qq787203167 d155adacc0 修改禅道已知bug 2022-07-02 11:35:19 +08:00
qq787203167 16979ff779 修改禅道已知bug 2022-07-02 10:57:02 +08:00
qq787203167 a889cb39a8 修改禅道已知bug 2022-07-02 09:59:55 +08:00
zyx.net 52caeb30d0 修改禅道bug 2022-07-01 19:04:19 +08:00
zyx.net 2a14a594b9 参数项收集清单列表增加分页 2022-07-01 17:13:55 +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 0a6c8f35dd 修改禅道已知bug 2022-07-01 13:28:51 +08:00
qq787203167 2cdb33e5d4 修改禅道已知bug 2022-07-01 11:56:32 +08:00
qq787203167 ecc44b5dc6 修改禅道已知bug 2022-07-01 11:37:22 +08:00
qq787203167 96da56370a 修改禅道已知bug 2022-07-01 11:24:27 +08:00
zyx.net daa0e9e65a 修改禅道bug 2022-07-01 10:51:52 +08:00
qq787203167 30eca7cf51 修改禅道已知bug 2022-06-30 20:19:00 +08:00