Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/muyu/system/service/impl/BuyServiceImpl.java

src/main/java/com/muyu/system/domain/ConnectorUser.java

@@ -33,6 +33,10 @@ public class ConnectorUser {
      * 购买次数
      */
     private Integer connectorFrequency;
+    /**
+     * 测试次数
+     */
+    private Integer textNumber;
     /**
      * 接口名称
      */

src/main/resources/mapper/system/BuyMapper.xml

@@ -6,7 +6,7 @@
     <insert id="addConnectorUser">
         INSERT INTO `text`.`connector_user`
             (`connector_user_id`, `user_id`, `connector_id`, `connector_residue_degree`, `connector_frequency`)
-        VALUES (0,#{userId}, #{connectorId}, 0, 0)
+        VALUES (0,#{userId}, #{connectorId}, 0, 0,5)
 
     </insert>