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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java

@@ -65,4 +65,13 @@ public class SessionUser implements Serializable {
         this.languageCode = languageCode;
         this.userType = userTypeId;
     }
+
+    /**
+     * 不建议使用， 推荐使用 AuthUtil.getDeviceId(); 方法
+     * @return
+     */
+    @Deprecated
+    public String getDeviceId() {
+        return deviceId;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -658,6 +658,7 @@ public class WmsHqlPack {
 
         getStringBuilderPack(wmsASNMasterDetails, result);
 
+        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"snOneBarCode"}, result);
         return result;
     }