Merge remote-tracking branch 'origin/master'

# Conflicts:
#	eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java

eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java

@@ -119,13 +119,7 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized {
      */
     public Page<AppEntity> getAppList(AppQuery appQuery, Pageable pageable) {
         //@formatter:off
-        StringBuilder builder = new StringBuilder("""
+        StringBuilder builder = new StringBuilder("SELECT DISTINCT app.* FROM app INNER JOIN app_group_association `group` ON app.id_ = `group`.app_id AND app.is_deleted = 0");
-                SELECT DISTINCT
-                	app.*
-                FROM
-                	app
-                	INNER JOIN app_group_association `group` ON app.id_ = `group`.app_id
-                """);
 
         //应用名称
         if (StringUtils.isNoneBlank(appQuery.getName())) {