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

mes/src/main/java/com/ximai/mes/pro/service/impl/AppConfigServiceImpl.java

@@ -109,6 +109,9 @@ public class AppConfigServiceImpl implements IAppConfigService {
 
     @Override
     public List<AppConfig> selectLastVersion(String appName) {
+        if(StringUtils.isBlank(appName)){
+            appName = "mesPad";
+        }
         QueryWrapper<AppConfig> appConfigQueryWrapper = new QueryWrapper<>();
         appConfigQueryWrapper.eq("last_version", 0);
         appConfigQueryWrapper.eq(StringUtils.isNotNull(appName), "app_name", appName);