Commit Graph
353 Commits
Author SHA1 Message Date
hanchaobo 1cf64e3b41 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2024-05-17 14:12:09 +08:00
hanchaobo f67c276eab 调解按钮权限,以及操作人下拉选禁用 2024-05-17 14:11:57 +08:00
hanchaoboandGitea 5038469490 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-16 16:19:47 +08:00
hanchaobo 11ecebb5f9 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2024-05-16 16:19:08 +08:00
hanchaobo fcab34b6eb bug修改 2024-05-16 16:18:59 +08:00
gaogaoyujieandGitea eaa129cfd4 Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-16 16:10:05 +08:00
gyj b0e379e8bb Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-05-16 16:07:58 +08:00
gyj 9d7247a4ed 测试bug 2024-05-16 10:27:26 +08:00
hanchaoboandGitea e6645c7685 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-13 13:51:01 +08:00
hanchaobo 3249841059 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2024-05-13 13:50:18 +08:00
hanchaobo 0ebb84bab1 是否有调解编辑only office权限 2024-05-13 13:50:06 +08:00
hanchaoboandGitea 68258f3451 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-11 16:09:41 +08:00
hanchaobo afb49528c1 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2024-05-11 16:08:59 +08:00
hanchaobo 5918d71352 onlyofficebug 2024-05-11 16:08:46 +08:00
gaogaoyujieandGitea 006260ffed Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-06 16:29:00 +08:00
gyj 0cfefe4893 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-05-06 16:27:51 +08:00
gyj 24cbd66d75 修改显示是否操作人 2024-05-06 16:27:26 +08:00
gaogaoyujieandGitea cd6a6064fa Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-06 16:01:24 +08:00
gyj 5df5678c95 解决冲突更改 2024-05-06 15:58:30 +08:00
gyj c5f5d8c98c 修改测试bug 2024-05-06 15:55:18 +08:00
hanchaoboandGitea b7705af7e0 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-06 10:00:10 +08:00
hanchaobo 61f6cd4742 视频会议问题 2024-05-06 09:59:16 +08:00
gaogaoyujieandGitea 18e07846a5 Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-30 15:32:48 +08:00
gyj fb97f76070 新增修改 2024-04-30 15:30:04 +08:00
gyj 4fc6019ffa Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-04-30 15:14:09 +08:00
gyj cde9f59262 新增修改 2024-04-30 15:13:48 +08:00
hanchaoboandGitea e6f456b0c9 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-30 15:07:01 +08:00
hanchaobo ce5938c4c3 修改bug 2024-04-30 15:06:08 +08:00
hanchaoboandGitea 5c3bbd469d Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-30 13:47:50 +08:00
hanchaobo 2a4759330b Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2024-04-30 13:46:40 +08:00
hanchaobo f00a25449f 调解书上传 2024-04-30 13:46:33 +08:00
gaogaoyujieandGitea 9b3145944d Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-30 13:45:14 +08:00
gyj 4b32e754c0 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-04-30 13:44:12 +08:00
gyj 921888a0c3 修改测试bug 2024-04-30 13:43:54 +08:00
hanchaoboandGitea 278a041a8a Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-30 10:50:14 +08:00
hanchaobo c144befe51 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2024-04-30 10:48:40 +08:00
hanchaobo c291d70a9f video/upload接口参数更改 2024-04-30 10:48:31 +08:00
gaogaoyujieandGitea fb864ad0b2 Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-30 10:40:17 +08:00
gyj 3e53480616 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-04-30 10:37:06 +08:00
gyj 3bf0460ddf 修改线下调解 2024-04-30 10:36:42 +08:00
gaogaoyujieandGitea 6aedf3c23d Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-29 14:18:14 +08:00
gyj ab0fc9d6f0 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-04-29 14:16:04 +08:00
gyj dbb2855547 修改测试bug 2024-04-29 14:15:35 +08:00
hanchaoboandGitea cd93c92b62 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-29 09:42:50 +08:00
hanchaobo 3c033f7cd9 '归档详情页面优化' 2024-04-29 09:41:53 +08:00
gaogaoyujieandGitea 3a6a780964 Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-25 18:02:27 +08:00
gyj fa0b195ec1 修改测试bug及人脸核实 2024-04-25 17:58:36 +08:00
gaogaoyujieandGitea 0d22fa41e1 Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-04-24 14:39:17 +08:00
gyj 96087a7247 核实调解员修改接口 2024-04-24 14:37:28 +08:00
gyj b7cd12db46 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-04-24 14:29:00 +08:00