diff --git a/.gitignore b/.gitignore index 89236392..ff3c963a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ crmeb/LOG_HOME_IS_UNDEFINED *. *. .DS_Store +<<<<<<< HEAD +======= # Large files *.zip @@ -16,4 +18,5 @@ crmeb/LOG_HOME_IS_UNDEFINED *.7z # Working directories -.claude/ \ No newline at end of file +.claude/ +>>>>>>> 6332e5584c59ad3c1c3eab43b79261a53c5a20e6 diff --git a/README.md b/README.md index 5b17edcc..65ce4bf9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ CRMEB开源商城系统Java版
- + @@ -24,10 +24,10 @@ CRMEB开源商城系统Java版
-[官网](https://www.crmeb.com/) | +[官网](https://www.crmeb.com/?from=giteejava) | [在线体验](https://admin.java.crmeb.net) | [帮助文档](https://doc.crmeb.com/java/crmeb_java) | -[技术社区](https://www.crmeb.com/ask/) +[技术社区](https://www.crmeb.com/ask?from=giteejava) [comment]: <> ([宽屏预览](https://gitee.com/ZhongBangKeJi/crmeb_java/blob/master/README.md)) @@ -72,7 +72,7 @@ CRMEB开源商城PHP：https://gitee.com/ZhongBangKeJi/CRMEB 系统代码全开源无加密，独立部署、二开方便，适用于企业新零售、分销、拼团、砍价，秒杀等各种业务需求。 -[![](https://crmebjavasingle.oss-cn-beijing.aliyuncs.com/crmebimage/251201003.jpg)](https://www.crmeb.com/index/java_merchant) +[![](crmeb/crmebimage/demoimage/251201003.jpg)](https://www.crmeb.com/index/java_merchant) --- @@ -153,16 +153,15 @@ H5端：https://java.crmeb.net
--- ### CRMEB开源技术交流 -欢迎加入CRMEB开源技术交流群，扫码进群免费领取接口文档、功能清单、UI设计图、思维导图等资源！ +欢迎加入CRMEB开源技术交流群，扫码进群免费领取接口文档、功能清单、思维导图等资源！ ![](crmeb/crmebimage/demoimage/wellcomJavaGroup.jpg) 您还可以在 [CRMEB技术社区](https://www.crmeb.com/ask/thread/list/152) 中提交Bug、交流解决方案、获取官方更新动态，CRMEB技术社区伴您一路前行。 -[![](https://crmebjavasingle.oss-cn-beijing.aliyuncs.com/crmebimage/251201002.jpg)](https://www.crmeb.com/index/java_merchant) +[![](crmeb/crmebimage/demoimage/251201002.jpg)](https://www.crmeb.com/index/java_merchant) -[![](https://crmebjavasingle.oss-cn-beijing.aliyuncs.com/crmebimage/251201005.jpg)](https://www.crmeb.com/index/java_merchant) +[![](crmeb/crmebimage/demoimage/251201005.jpg)](https://www.crmeb.com/index/java_merchant) -[![](https://crmebjavasingle.oss-cn-beijing.aliyuncs.com/crmebimage/251201004.jpg)](https://www.crmeb.com/index/java_merchant) +[![](crmeb/crmebimage/demoimage/251201004.jpg)](https://www.crmeb.com/index/java_merchant) -[![](https://crmebjavasingle.oss-cn-beijing.aliyuncs.com/crmebimage/251201001.gif)](https://www.crmeb.com/index/java_merchant) \ No newline at end of file diff --git a/crmeb/crmeb-admin/src/main/resources/fonts/WenQuanZhengHei.ttf b/crmeb/crmeb-admin/src/main/resources/fonts/WenQuanZhengHei.ttf deleted file mode 100644 index f84e9feb..00000000 Binary files a/crmeb/crmeb-admin/src/main/resources/fonts/WenQuanZhengHei.ttf and /dev/null differ diff --git a/crmeb/crmeb-front/src/main/resources/fonts/WenQuanZhengHei.ttf b/crmeb/crmeb-front/src/main/resources/fonts/WenQuanZhengHei.ttf deleted file mode 100644 index f84e9feb..00000000 Binary files a/crmeb/crmeb-front/src/main/resources/fonts/WenQuanZhengHei.ttf and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/001admin.jpg b/crmeb/crmebimage/demoimage/001admin.jpg deleted file mode 100644 index 64be7074..00000000 Binary files a/crmeb/crmebimage/demoimage/001admin.jpg and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/001front.jpg b/crmeb/crmebimage/demoimage/001front.jpg deleted file mode 100644 index 26e052a9..00000000 Binary files a/crmeb/crmebimage/demoimage/001front.jpg and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/02yulan.jpg b/crmeb/crmebimage/demoimage/02yulan.jpg deleted file mode 100644 index 7b143a15..00000000 Binary files a/crmeb/crmebimage/demoimage/02yulan.jpg and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/13yemiandesiner-min.gif b/crmeb/crmebimage/demoimage/13yemiandesiner-min.gif deleted file mode 100644 index 85608c12..00000000 Binary files a/crmeb/crmebimage/demoimage/13yemiandesiner-min.gif and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/13yemiandesiner.gif b/crmeb/crmebimage/demoimage/13yemiandesiner.gif deleted file mode 100644 index 30496bac..00000000 Binary files a/crmeb/crmebimage/demoimage/13yemiandesiner.gif and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/14yijianhuanse-min.gif b/crmeb/crmebimage/demoimage/14yijianhuanse-min.gif deleted file mode 100644 index 996b4b58..00000000 Binary files a/crmeb/crmebimage/demoimage/14yijianhuanse-min.gif and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/14yijianhuanse.gif b/crmeb/crmebimage/demoimage/14yijianhuanse.gif deleted file mode 100644 index c31cf548..00000000 Binary files a/crmeb/crmebimage/demoimage/14yijianhuanse.gif and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/15webPCadmin-min.gif b/crmeb/crmebimage/demoimage/15webPCadmin-min.gif deleted file mode 100644 index c89714c9..00000000 Binary files a/crmeb/crmebimage/demoimage/15webPCadmin-min.gif and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/15webPCadmin.gif b/crmeb/crmebimage/demoimage/15webPCadmin.gif deleted file mode 100644 index 16346882..00000000 Binary files a/crmeb/crmebimage/demoimage/15webPCadmin.gif and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/17lianxikefu.png b/crmeb/crmebimage/demoimage/17lianxikefu.png deleted file mode 100644 index 28348691..00000000 Binary files a/crmeb/crmebimage/demoimage/17lianxikefu.png and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/251201002.jpg b/crmeb/crmebimage/demoimage/251201002.jpg new file mode 100644 index 00000000..03a133a1 Binary files /dev/null and b/crmeb/crmebimage/demoimage/251201002.jpg differ diff --git a/crmeb/crmebimage/demoimage/251201003.jpg b/crmeb/crmebimage/demoimage/251201003.jpg new file mode 100644 index 00000000..e8ab98b2 Binary files /dev/null and b/crmeb/crmebimage/demoimage/251201003.jpg differ diff --git a/crmeb/crmebimage/demoimage/251201004.jpg b/crmeb/crmebimage/demoimage/251201004.jpg new file mode 100644 index 00000000..404192fd Binary files /dev/null and b/crmeb/crmebimage/demoimage/251201004.jpg differ diff --git a/crmeb/crmebimage/demoimage/251201005.jpg b/crmeb/crmebimage/demoimage/251201005.jpg new file mode 100644 index 00000000..5c046566 Binary files /dev/null and b/crmeb/crmebimage/demoimage/251201005.jpg differ diff --git a/crmeb/crmebimage/demoimage/home2023618.jpg b/crmeb/crmebimage/demoimage/home2023618.jpg deleted file mode 100644 index ae34d8ce..00000000 Binary files a/crmeb/crmebimage/demoimage/home2023618.jpg and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/kefu.jpg b/crmeb/crmebimage/demoimage/kefu.jpg deleted file mode 100644 index c593687b..00000000 Binary files a/crmeb/crmebimage/demoimage/kefu.jpg and /dev/null differ diff --git a/crmeb/crmebimage/demoimage/wellcomJavaGroup.jpg b/crmeb/crmebimage/demoimage/wellcomJavaGroup.jpg old mode 100644 new mode 100755 index ce6424ff..8a09b36a Binary files a/crmeb/crmebimage/demoimage/wellcomJavaGroup.jpg and b/crmeb/crmebimage/demoimage/wellcomJavaGroup.jpg differ