Merge branch 'develop' into master

common/Alias/Model.php

@@ -2,7 +2,7 @@
 namespace ProVM\Common\Alias;
 
 use \Model as BaseModel;
-use ProVM\Common\Alias\Model as ModelInterface;
+use ProVM\Common\Define\Model as ModelInterface;
 use ProVM\Common\Factory\Model as ModelFactory;
 
 abstract class Model extends BaseModel implements ModelInterface {

common/Factory/Model.php

@@ -3,7 +3,7 @@ namespace ProVM\Common\Factory;
 
 use ORM;
 use Model as BaseModel;
-use ProVM\Common\Alias\Model as ModelInterface;
+use ProVM\Common\Define\Model as ModelInterface;
 
 class Model {
   public function reset(): Model {

common/Form/Model.php

@@ -1,6 +1,6 @@
 <?php
 namespace ProVM\Common\Form;
 
-use ProVM\Common\Define\Model as BaseModel;
+use ProVM\Common\Alias\Model as BaseModel;
 
 abstract class Model extends BaseModel {}