Merge remote-tracking branch 'origin/master'

liujie

8 天以前 7342170db7dc39326698d39b74e1858502fd574a

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOff1Data.java

@@ -15,6 +15,10 @@
    */
   private String partnerId;
   /**
    * 超时时间
    */
   private String timeout;
   /**
    * 场景标识。交通场景传”TRAFFIC”
    */
   private String scene;