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

alien-store/src/main/java/shop/alien/store/service/impl/StoreStaffConfigServiceImpl.java

@@ -425,7 +425,7 @@ public class StoreStaffConfigServiceImpl implements StoreStaffConfigService {
         // 构建查询条件：查询指定店铺下未删除的员工
         LambdaQueryWrapper<StoreStaffConfig> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(StoreStaffConfig::getStoreId, storeId)
-                .eq(StoreStaffConfig::getDeleteFlag, CommonConstant.DELETE_FLAG_UNDELETE)
+                .eq(StoreStaffConfig::getDeleteFlag, 0)
                 // 只查询staff_position不为空的记录
                 .isNotNull(StoreStaffConfig::getStaffPosition)
                 .ne(StoreStaffConfig::getStaffPosition, "")