# 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
hejinbo
0a16acb362
Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb