Merge remote-tracking branch 'origin/test' into test

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockDetailDto.java

@@ -62,6 +62,8 @@ public class TbProductStockDetailDto implements Serializable {
     /** 关联订单Id */
     private String orderId;
 
+    private String orderNo;
+
     /**  1入库 -1出库 */
     private Integer subType;
 

eladmin-system/src/main/java/cn/ysk/cashier/dto/rabbit/StockRecordMsg.java

@@ -10,5 +10,6 @@ public class StockRecordMsg {
     private String type;
     private Integer subType;
     private Integer number;
+    private String operator;
     private String remark;
 }