Merge branch 'develop/v1.0' into master-test

pdf-office-payment/src/main/resources/mapper/SubscriptionsMapper.xml

@@ -61,6 +61,7 @@
         WHERE s.user_id = #{userId}
           AND p.code not like '%ai%'
           AND o.pay_number = 1
+          AND p.app_id = '1'
     </select>
     <select id="countAdvancedSubscriptions" resultMap="SubscriptionsResultMap">
         SELECT s.*,p.code