Merge remote-tracking branch 'origin/feature/无效接口删除' into developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -202,7 +202,7 @@ public interface StaffApiService {
      * @return int
      */
     //无效接口
-//    int updateQrCodeByStaffId(String staffId, String qrCode);
+    int updateQrCodeByStaffId(String staffId, String qrCode);
 
     /**
      * 通过userID更新员工二维码

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -717,10 +717,6 @@ public class StaffApiServiceImpl implements StaffApiService {
         return staffMapper.updateOpenIdByStaffId(staffId, openId);
     }
 
-//    @Override
-//    public int updateQrCodeByStaffId(String staffId, String qrCode) {
-//        return staffMapper.updateQrCodeByStaffId(staffId, qrCode);
-//    }
     @Override
     public int getSensitiveStatus(String staffId) {
         String qrCode = staffMapper.getQrCodeByStaffId(staffId);
@@ -729,10 +725,6 @@ public class StaffApiServiceImpl implements StaffApiService {
         return 0;
     }
 
-//    @Override
-//    public int updateQrCodeByStaffId(String staffId, String qrCode) {
-//        return staffMapper.updateQrCodeByStaffId(staffId, qrCode);
-//    }
 
     @Override
     public int updateQrCodeByUserId(String userId, String qrCode) {
@@ -740,6 +732,11 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
+    public int updateQrCodeByStaffId(String staffId, String qrCode) {
+        return staffMapper.updateQrCodeByStaffId(staffId, qrCode);
+    }
+
+    @Override
     public StaffQrCodeDTO getQrCodeByClerkId(String clerkId) {
         StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
         if (staffClerkRelationDTO == null) {