Issue 10. Model
Issue 10. Model
Issue 8
Issue 8
Issue 8
Issue 8. Kayra ondodum
Issue 8. Kayra ondodum
ticket#11
dukon koshuu
#11
fixed #4
AddShoptu o4urdum
fixed #11
fixed #11
fixed #7
fixed #8
fixed #8
Merge remote-tracking branch 'origin/Kalys'

Conflicts:
	JavaFXApplication/src/main/java/javafxapplication/Controller/MainController.java
Merge remote-tracking branch 'origin/Tynchtyk'

Conflicts:
	JavaFXApplication/src/main/java/javafxapplication/Proxy/ShopProxy.java
	JavaFXApplication/src/main/resources/View/MainWindow.fxml
	server/src/main/java/hello/Controller/ShopController.java
	server/src/main/java/hello/Model/RequestDto/AddShopRequest.java
	server/src/main/java/hello/Model/Shop.java
	server/src/main/java/hello/Model/ShopRepository.java
Merge remote-tracking branch 'origin/AkimB'

Conflicts:
	JavaFXApplication/src/main/java/javafxapplication/JavaFXApplication.java
	JavaFXApplication/src/main/java/javafxapplication/Model/Product.java
	JavaFXApplication/src/main/java/javafxapplication/Model/Shop.java
	JavaFXApplication/src/main/resources/View/MainWindow.fxml
	server/src/main/java/hello/Controller/ShopController.java