Merge branch 'lvlanzi' of gitlab.freemud.com:zhenfei.zhang/fmPOS into lvlanzi

# Conflicts:
#	fmp_redeem/fmp_redeem_i.h

fmp_redeem/fmp_redeem_i.h

@@ -20,8 +20,8 @@ public:
         connect(this, &FMPRedeemInterface::TriggerUninit, this, &FMPRedeemInterface::OnTriggerUninit);
     }
     
-    virtual QJsonObject Redeem(QJsonObject redeemInfo) = 0; //券码核销
-    virtual QJsonObject Reverse(QJsonObject request) = 0; //卡券冲正
+    virtual QJsonObject Redeem(const QJsonArray& productsInfo) = 0; //券码核销
+    virtual QJsonObject Redeem(const QJsonObject& productsInfoObj) = 0; //券码核销
     virtual QJsonObject GetRedeemJson()const = 0;
     
 signals: