Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-workflow/src/main/java/com/zjugis/z_workflow/utils/YmlUtil.java

@@ -14,7 +14,7 @@ import org.apache.logging.log4j.util.Strings;
  */
 public class YmlUtil {
 
-	private static String ymlName = "application-local.yaml";//yml文件名称
+	private static String ymlName = "application.yaml";//yml文件名称
 	private static String commonSystemUrl;//通用系统Url
 	private static String zUserOrgRightUrl;
 	private static String zWorkFlowUrl;