Merge remote-tracking branch 'origin/master'

6b6e04e7 · 廖旭伟 · 677bdec6 · 788c8b2f · 6b6e04e7 · 6b6e04e7
Commit 6b6e04e7 authored Nov 14, 2023 by 廖旭伟
3 changed files
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppQuery.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppQuery.java
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppVo.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppVo.java
@@ -55,4 +55,10 @@ public class AppVo extends BaseEntityLong {
     */
    private Long targetAppId;

+    /** 类型(1.应用程序,2.url)列表 */
+    private List <Integer> appTypeList;
+
+    /** 类型(1.应用程序,2.url)排除列表 */
+    private List <Integer> appTypeNotList;
+
 }
\ No newline at end of file
--- a/base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
@@ -25,7 +25,7 @@ Content-Type: application/json



-{"siteId":"22","page":1,"size":-1}
+{"siteId":"22",appTypeList,"page":1,"size":-1}


 ###自助终端应用更新与保存