Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java

@@ -86,7 +86,7 @@ public interface SysCustomerMapper
 
     int restoreSysCustomerById(Long id);
 
-    SysCustomerVo cancelSysCustomerById(Long id);
+    int cancelSysCustomerById(Long id);
 
     SysCustomerVo selectSysCustomerByCustomer(SysCustomerVo sysCustomerVo);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java

@@ -319,7 +319,7 @@ public class SysCustomerServiceImpl implements ISysCustomerService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ProcessInstance cancelSysCustomerById(Long id) {
-        SysCustomerVo sysCustomerVo = sysCustomerMapper.cancelSysCustomerById(id);
+        SysCustomerVo sysCustomerVo = sysCustomerMapper.selectSysCustomerById(id);
         // 审核状态-待审核
         sysCustomerVo.setAuditStatus("0");
         SysUser user = ShiroUtils.getSysUser();

ruoyi-admin/src/main/resources/templates/system/customer/customer.html

@@ -414,6 +414,8 @@
             removeUrl: prefix + "/remove",
             exportUrl: prefix + "/export",
             detailUrl: prefix + "/detail/{id}",
+            cancelUrl: prefix + "/cancel/{id}",
+            restoreUrl: prefix + "/restore/{id}",
             modalName: "客户基本信息",
             fixedColumns:true,
             fixedRightNumber:1,