SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
670 Commits 12 Branches 0 Tags
07d80398aebd555f3d37736bbd5b092ef539bc06
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hejinbo 07d80398ae 语音转录 2023-11-29 21:16:38 +08:00
hejinbo 7c665da605 修改 2023-11-29 16:25:26 +08:00
hejinbo 7bcb28cdac Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-29 16:04:19 +08:00
hejinbo cbc1a23715 修改 2023-11-29 15:59:25 +08:00
hejinbo 0b8c566f1d Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-28 15:35:40 +08:00
hejinbo 9807b13101 暂存 2023-11-28 15:34:58 +08:00
hejinbo 12d94a38ca Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-27 17:28:57 +08:00
hejinbo 6a0009a3ad 暂存 2023-11-27 17:28:37 +08:00
hejinbo 1a1f87c998 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-11-25 18:06:05 +08:00
hejinbo 17b35f7095 暂存 2023-11-25 17:56:52 +08:00
hejinbo e3cd2495cf 压缩包导入 2023-11-24 18:57:35 +08:00
hejinbo 3a393be18d 批量缴费确认 2023-11-23 20:27:27 +08:00
hejinbo 20d8d2e045 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-23 20:16:25 +08:00
hejinbo 74305b5728 xiufu 2023-11-23 20:15:55 +08:00
hejinbo 80f6e726f8 倒序 2023-11-23 18:41:59 +08:00
hejinbo 6798d64993 修改xml 2023-11-23 17:52:49 +08:00
hejinbo 365409ab6d Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-23 17:36:11 +08:00
hejinbo 607da65dc4 11.23开发 2023-11-23 17:35:59 +08:00
hejinbo 9ee2e83c7a Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-22 17:15:20 +08:00
hejinbo 940244f829 11.22开发 2023-11-22 17:15:00 +08:00
hejinbo 80523e71d1 机构、模板管理优化接口 2023-11-22 11:51:51 +08:00
hejinbo 06b0822a15 111 2023-11-21 14:54:36 +08:00
hejinbo 0b94672e58 批量缴费接口开发 2023-11-21 14:53:07 +08:00
hejinbo 2438e89252 模板管理修改接口 2023-11-20 14:39:01 +08:00
hejinbo 36e7342d85 模板管理查询修改 2023-11-20 11:02:38 +08:00
hejinbo 440e895c51 模板管理查询修改 2023-11-20 10:44:41 +08:00
hejinbo 004c736aa1 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-20 10:40:44 +08:00
hejinbo 09d814566f Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-17 17:50:24 +08:00
hejinbo 35a9faeb6a 模板管理开发 2023-11-17 17:49:53 +08:00
hejinbo 736b189473 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-17 14:25:53 +08:00
hejinbo 2557d57508 zancun 2023-11-17 14:25:03 +08:00
hejinbo 7fe72980ac Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-16 19:23:10 +08:00
hejinbo c644fb3142 修复公章管理 2023-11-16 19:23:01 +08:00
hejinbo f5aa2d9d06 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-16 14:30:00 +08:00
hejinbo 0d197b2aa9 genggai 2023-11-16 14:21:43 +08:00
hejinbo 091d9e4af9 pull dev 2023-11-16 10:54:52 +08:00
hejinbo a4e8347835 zancun 2023-11-16 10:42:19 +08:00
hejinbo 8b0eae8dca 机构管理.公章管理优化 2023-11-15 18:27:09 +08:00
hejinbo 044cffeb7f Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-15 09:06:51 +08:00
hejinbo 4088cf7357 公章管理测试 2023-11-15 09:01:20 +08:00
hejinbo dac20a4a04 11.14批量生成裁决书 2023-11-14 14:42:10 +08:00
hejinbo de3fc04a05 11.13开发 2023-11-13 16:16:44 +08:00
hejinbo b3361914bd Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-13 13:56:20 +08:00
hejinbo 9a9cacbdd5 11.13 查询和流程节点修改 2023-11-13 13:55:44 +08:00
hejinbo 8123e78e93 11.11中午添加白工校验参数代码 2023-11-11 12:12:23 +08:00
hejinbo dd856a7619 10号晚测完系统后代码 2023-11-10 23:45:56 +08:00
hejinbo ffc559543c 合并冲突解决 2023-11-10 18:20:04 +08:00
hejinbo 4cf4fa6f5c 11.10 开发 2023-11-10 18:08:30 +08:00
hejinbo 7cfc39190a Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-09 17:35:22 +08:00
hejinbo 94d3f1cb1e 11.9开发 2023-11-09 17:34:12 +08:00
hejinbo ae2c8fe59f Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-08 17:48:05 +08:00
hejinbo 1cdf3abc30 11.8kaifa 2023-11-08 17:47:59 +08:00
hejinbo 8c890c415a Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-08 10:38:17 +08:00
hejinbo b18075b0c4 优化裁决书 2023-11-08 10:37:48 +08:00
hejinbo f0e9261c22 邮件发送记录增加发送状态 2023-11-06 11:16:54 +08:00
hejinbo e85fb44ef2 11.3发版,注释秦工下载文件代码 2023-11-03 20:05:12 +08:00
hejinbo 15426c5b7b Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-03 18:33:20 +08:00
hejinbo 84621de905 更改短信新增发送记录 2023-11-03 16:51:26 +08:00
hejinbo a0d2ce44d0 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-03 16:28:30 +08:00
hejinbo 43ba159489 添加短信发送状态 2023-11-03 16:28:01 +08:00
hejinbo 5b7b839395 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-03 11:47:46 +08:00
hejinbo 876d0807c7 裁决书插入证据图片 2023-11-03 11:47:39 +08:00
hejinbo 5120c7c2d2 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-02 17:49:26 +08:00
hejinbo 9fdbc8712a 改bug 2023-11-02 17:49:20 +08:00
hejinbo f4f7153278 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-01 18:05:01 +08:00
hejinbo 790419b95d 改bug 2023-11-01 18:04:48 +08:00
hejinbo 314a687943 优化 2023-11-01 11:37:57 +08:00
hejinbo 8e82f8eaa2 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-11-01 09:19:10 +08:00
hejinbo 106ccce871 书面审理接口修改 2023-11-01 09:18:40 +08:00
hejinbo 2238224e83 10.31开发 2023-10-31 19:15:46 +08:00
hejinbo ac68c446fc 解决bug 2023-10-30 15:53:58 +08:00
hejinbo 1e7019cba9 解决bug 2023-10-26 16:15:56 +08:00
hejinbo ce64d7f203 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-26 15:38:20 +08:00
hejinbo 2ae2155808 10.26开发 2023-10-26 15:38:16 +08:00
hejinbo 524fdd2675 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-25 16:57:01 +08:00
hejinbo ec20f9d7d5 10.25开发 2023-10-25 16:56:37 +08:00
hejinbo e0fe19ebcb 更新代码 2023-10-24 17:30:08 +08:00
hejinbo f682811fdb Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-24 17:24:19 +08:00
hejinbo 16cbd67b01 获取证据目录列表 2023-10-24 17:23:58 +08:00
hejinbo befa62e69f 增加证据目录字段 2023-10-24 10:36:41 +08:00
hejinbo 2261a549f8 返回生成的自增id 2023-10-24 09:56:10 +08:00
hejinbo beb9e212f4 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-23 17:56:26 +08:00
hejinbo ca768ad0d6 10.23开发 2023-10-23 17:54:51 +08:00
hejinbo 2d3b08d027 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java
 2023-10-18 13:50:38 +08:00
hejinbo 953410c5df 暂存 2023-10-18 10:22:10 +08:00
hejinbo 163b99c7b1 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-18 09:54:43 +08:00
hejinbo eff4c740aa 10.17开发 2023-10-17 18:27:21 +08:00
hejinbo fe536eb7b5 优化 2023-10-17 16:52:09 +08:00
hejinbo d026e0f7ea Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-17 15:59:11 +08:00
hejinbo 41387c58d4 暂存 2023-10-17 15:59:04 +08:00
hejinbo 2104c70e25 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-17 09:27:37 +08:00
hejinbo 06e008e306 暂存 2023-10-16 17:20:44 +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
hejinbo 7a2a662c5f 审核裁决书接口优化 2023-10-13 13:27:14 +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
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
hejinbo 3262548b25 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb 2023-10-12 13:59:10 +08:00