375 Commits
Author SHA1 Message Date
gaogaoyujieandGitea be87d34f5d Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-31 16:58:31 +08:00
gyj 07d7396959 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-05-31 08:59:45 +08:00
gyj ef32184541 修改版本号 2024-05-31 08:58:39 +08:00
gaogaoyujieandGitea 5f7e0ad19e Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-30 16:20:47 +08:00
gyj 971461aaa8 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-05-30 16:20:04 +08:00
gyj a3de506391 调解修改短信bug 2024-05-30 16:19:43 +08:00
gaogaoyujieandGitea d901c1efdd Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-28 11:32:01 +08:00
gyj 48b0eacc36 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-05-28 11:30:57 +08:00
gyj aa4da2ae82 邮件接口联调 2024-05-28 11:30:39 +08:00
gaogaoyujieandGitea 0885cd8538 Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-28 09:32:01 +08:00
gyj 1f1da394d5 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-05-28 09:30:42 +08:00
gyj 04e10ea37f 邮箱附件 2024-05-28 09:30:24 +08:00
hanchaoboandGitea 83624ae5a2 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-20 17:01:11 +08:00
hanchaobo 0d62eda5a8 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2024-05-20 17:00:17 +08:00
hanchaobo 0ce29b99ac 新增机构切换清楚地址逻辑 2024-05-20 17:00:06 +08:00
gaogaoyujieandGitea 30d335340a Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-20 15:50:59 +08:00
gyj 0f5f320312 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-05-20 15:47:47 +08:00
gyj 6156b82b6c 修改调解bug 2024-05-20 15:47:19 +08:00
gaogaoyujieandGitea c6aafbf252 Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-17 17:15:45 +08:00
gyj 604d76e1fd Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2024-05-17 17:14:45 +08:00
gyj 3b809685e3 发布版本 2024-05-17 17:14:28 +08:00
hanchaoboandGitea 96086cf6f9 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2024-05-17 14:13:12 +08:00
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