Merge remote-tracking branch 'origin/master'
# Conflicts: # src/pages/LeadsPage/tabs/ProductAndServiceTab/components/ProductView/ProductView.tsx
This commit is contained in:
		@@ -8,5 +8,6 @@ export type DealProductSchema = {
 | 
			
		||||
    product: ProductSchema;
 | 
			
		||||
    services: Array<DealProductServiceSchema>;
 | 
			
		||||
    quantity: number;
 | 
			
		||||
    comment?: string;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user