From 37781bdea9b06d42eaae0df34591697b290ae20c Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Mon, 21 Sep 2020 11:12:57 +0800 Subject: [PATCH] Merge branch 'master' into pay_master --- .gitignore | 46 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 19f634a..2af840c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,32 @@ -.idea/compiler.xml -.idea/compiler.xml -.idea/workspace.xml -.idea/compiler.xml -.idea/workspace.xml -.idea/workspace.xml -kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/filecenter/config/FeignMultipartConfig.class -kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory$1.class -kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/sms/feign/fallback/SmsChuangLanServiceFallbackFactory$1.class -kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/sms/feign/fallback/SmsChuangLanServiceFallbackFactory.class -kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/target/classes/com/kidgrow/sms/feign/SmsChuangLanService.class -*.class -*.jar -.idea \ No newline at end of file +HELP.md +/target/ +!.mvn/wrapper/maven-wrapper.jar +/*/target/ +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +/build/ + +### VS Code ### +.vscode/ +/kidgrow-web/kidgrow-web-manager/src/main/resources/static/package-lock.json +/kidgrow-web/kidgrow-web-manager/src/main/resources/static.zip +/git -- Gitblit v1.8.0