Commit Graph
263 Commits
Author SHA1 Message Date
qtzandGitea 94b304d417 Merge branch 'qtz3' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-15 10:27:54 +08:00
qitz c64b709e33 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3 2023-10-15 10:17:07 +08:00
qitz 6b56829d92 实现生成庭审笔录 2023-10-15 10:16:48 +08:00
bgyandGitea 2a40d552e3 Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 19:25:25 +08:00
gy b 032c7bfca1 优化报错代码 2023-10-13 19:24:52 +08:00
bgyandGitea 01d86180a9 Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 18:28:04 +08:00
gy b edfd847318 整合最新的代码 2023-10-13 18:25:51 +08:00
gy b 36ad2c9ecd Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into bgy 2023-10-13 15:26:32 +08:00
gy b ce01c9366a 取消部门接口权限校验 2023-10-13 15:20:50 +08:00
wangqiong123andGitea a74345ea5f Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 15:13:56 +08:00
18792927508 b7b46f1350 跳转微信小程序接口 2023-10-13 15:13:32 +08:00
hejinboandGitea c21e092c89 Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 15:01:10 +08:00
hejinbo 867ce2d4ba Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
2023-10-13 15:00:24 +08:00
hejinbo 0a16acb362 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SealSignRecordMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SealSignRecordMapper.xml
2023-10-13 14:52:00 +08:00
wangqiong123andGitea 9a59fac610 Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 14:35:57 +08:00
18792927508 f20736282b 合并代码及跳转小程序 2023-10-13 14:35:24 +08:00
qtzandGitea 08a6e72cc2 Merge branch 'qtz3' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 14:07:42 +08:00
qitz 16bfd769aa Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3 2023-10-13 14:05:37 +08:00
qitz 3c22cec221 优化定时查询接口 2023-10-13 14:05:12 +08:00
wangqiong123andGitea a583b2b195 Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 13:33:14 +08:00
18792927508 bf92e05cbe 房间号短信id修改 2023-10-13 13:32:48 +08:00
hejinbo 7a2a662c5f 审核裁决书接口优化 2023-10-13 13:27:14 +08:00
qtzandGitea e4fa622b71 Merge branch 'qtz3' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 11:18:53 +08:00
qitz d6da8ddd2f Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3 2023-10-13 11:17:07 +08:00
qitz 8306ae0f39 优化签名记录 2023-10-13 11:16:55 +08:00
qtzandGitea 616be649b5 Merge branch 'qtz3' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 11:11:44 +08:00
qitz a0ecc6bd69 1 2023-10-13 11:09:10 +08:00
qitz 3dcf07881a 查询流程状态 2023-10-13 10:57:45 +08:00
hejinbo 4d4276847b Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-13 10:38:50 +08:00
hejinbo c7fad71ae2 暂存 2023-10-13 10:38:42 +08:00
wangqiong123andGitea dbc73da777 Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-13 09:05:00 +08:00
18792927508 b28a16dcea bug修改 2023-10-13 09:04:29 +08:00
bgyandGitea cf73d6e338 Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-12 20:12:42 +08:00
gy b dcb1139a6a 修改数据库配置 2023-10-12 20:11:09 +08:00
hejinboandGitea 52e0baa614 Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-12 18:22:51 +08:00
hejinbo ede7c4452d Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SealSignRecordMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SealSignRecordMapper.xml
2023-10-12 18:20:58 +08:00
hejinbo 0ee4c53252 10.12开发 2023-10-12 18:12:12 +08:00
qtzandGitea a9c86dc6dc Merge branch 'qtz3' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-12 17:52:08 +08:00
qitz 12ed3200a2 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
2023-10-12 17:48:23 +08:00
qitz 23614f7e9c 1 2023-10-12 17:44:17 +08:00
wangqiong123andGitea 40b623024c Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-12 17:33:54 +08:00
18792927508 be6ec797c7 申请人发送短信名称修改 2023-10-12 17:32:43 +08:00
wangqiong123andGitea 35556e2acd Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-12 17:24:40 +08:00
18792927508 72d02890b0 给仲裁员发短信修改 2023-10-12 17:23:15 +08:00
qitz bcc07b181d 实现定时查询流程详情 2023-10-12 17:20:40 +08:00
wangqiong123andGitea 00f6ad1417 Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-12 16:11:32 +08:00
18792927508 3398f0db3d 仲裁员改为和用户关联 2023-10-12 16:10:53 +08:00
hejinbo 3262548b25 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-12 13:59:10 +08:00
wangqiong123andGitea 08bb2af98e Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev 2023-10-12 13:53:54 +08:00
18792927508 8b3c5a3741 1 2023-10-12 13:53:01 +08:00