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

# Conflicts:
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/AppmanageServiceImpl.java

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/AppBaseInfoMapper.xml

@@ -29,6 +29,7 @@
         from app_base_info
 
         where del_flag = 0
+        and info_status != 0
         <if test="permissionSql !=null and permissionSql != ''">
             ${permissionSql}
         </if>