合并分支

2025-08-23 15:23:50 +08:00
parent 8bc2fa8d97 2b7c9497c6
commit ff928bb8b6
31 changed files with 2251 additions and 3 deletions
--- a/src/components/Range/index.tsx
+++ b/src/components/Range/index.tsx
@@ -11,7 +11,10 @@ interface RangeProps {
  onChange?: (value: [number, number]) => void;
  disabled?: boolean;
  className?: string;
+<<<<<<< HEAD
  showTitle?: boolean;
+=======
+>>>>>>> 2b7c9497c6d5b1f3edb2ddd937855570c0cc8eca
 }

 const NtrpRange: React.FC<RangeProps> = ({
@@ -22,7 +25,10 @@ const NtrpRange: React.FC<RangeProps> = ({
  onChange,
  disabled = false,
  className,
+<<<<<<< HEAD
  showTitle = true,
+=======
+>>>>>>> 2b7c9497c6d5b1f3edb2ddd937855570c0cc8eca
 }) => {
  const [currentValue, setCurrentValue] = useState<[number, number]>(value);