Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui

# Conflicts:
#	pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java

pluss-model-bundle/src/main/java/cn/pluss/platform/pos/ReturnFundsReq.java

@@ -2,11 +2,15 @@ package cn.pluss.platform.pos;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class ReturnFundsReq extends  BasePosReq{
+public class ReturnFundsReq implements Serializable {
 
 
     private String orderNumber;
 
     private String sn;
+
+    private String remark;
 }