Merge remote-tracking branch 'origin/weiran'

cloud-market-common/src/main/java/com/muyu/cloud/market/domin/MyApi.java

@@ -89,4 +89,12 @@ public class MyApi {
      * 重要路径
      */
     private String apiRouter;
+    /**
+     * 允许试用次数
+     */
+    private Integer userCount;
+    /**
+     * 是否被购买
+     */
+    private String remark;
 }

cloud-market-server/src/main/resources/mapper/market/MyApiMapper.xml

@@ -20,6 +20,8 @@
         <result property="returnFormat" column="return_format"></result>
         <result property="requestMethod" column="request_method"></result>
         <result property="apiRouter" column="api_router"></result>
+        <result property="remark" column="remark"></result>
+        <result property="userCount" column="user_count"></result>
     </resultMap>
 
     <sql id="selectmyapi">
@@ -37,7 +39,9 @@
             api_address,
             return_format,
             request_method,
-            api_router
+            api_router,
+            remark,
+            user_count
         FROM
             myapi
                 LEFT JOIN product ON myapi.product_id = product.product_id