34 Commits (dev)

Author SHA1 Message Date
zhenghuang 2b7d128ef1 定时器,欢迎语 5 years ago
zhenghuang 8782e51d69 定时器,欢迎语 5 years ago
zhenghuang 4ad5870c53 定时器,欢迎语 5 years ago
root 732f299034 去除无效的包 5 years ago
kevin jiang 57bb7048cf 启动报错问题修改。 5 years ago
kevin jiang 1d85443387 Merge branch 'master' into feature/20200531
# Conflicts:
#	src/main/java/com/kiisoo/ic/customer/CustomerService.java
5 years ago
root 389a737c52 Merge remote-tracking branch 'remotes/src/dev_0531' into dev
# Conflicts:
#	pom.xml
5 years ago
kevin jiang 3f0d76d70f 优化手机端首页和好友列表接口。 5 years ago
zyy fabc6dbca4 排除tomcat依赖 5 years ago
zyy 3ebcefc0b5 排除tomcat依赖 5 years ago
root e4f170cdad Merge remote-tracking branch 'remotes/origin/feature/20200531'
# Conflicts:
#	src/main/java/com/kiisoo/ic/customer/CustomerService.java
#	src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
#	src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java
#	src/main/java/com/kiisoo/ic/synchronous/service/PromotionCodeService.java
#	src/main/resources/application-dev.yml
#	src/test/java/test/Test.java
5 years ago
root 506fc95c0e Merge remote-tracking branch 'remotes/origin/feature/20200531'
# Conflicts:
#	src/main/java/com/kiisoo/ic/customer/CustomerService.java
#	src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
#	src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java
#	src/main/java/com/kiisoo/ic/synchronous/service/PromotionCodeService.java
#	src/main/resources/application-dev.yml
#	src/test/java/test/Test.java
5 years ago
kevin jiang e4bfc12085 redis 5 years ago
kevin jiang 3e375d8552 pom去除重复的依赖包。 5 years ago
kevin jiang edabb84415 pom去除重复的依赖包。 5 years ago
kevin jiang c549631433 优化同步明细接口。 5 years ago
zyy 7318cf8ef7 导购接口 5 years ago
zhenghuang 1d035858d3 swagger mysql 6 years ago
zhenghuang 2b357e8624 swagger mysql 6 years ago
zhenghuang e71575b8e4 swagger mysql 6 years ago
kevin jiang e35a216ce0 去掉无用依赖包。 6 years ago
LegnaYet 314a75daa8 门店号管理 6 years ago
LegnaYet 5a2b013757 下载二维码,添加客户表情bug 6 years ago
wangweijia 274dc7de72 下拉修改 6 years ago
yinliujing d6fed2deaf 修改test包位置错误 6 years ago
wangweijia 7ab6d31a36 增加消息组件 6 years ago
jiangyunjie c4aab3efa2 门店推广数据接口 6 years ago
LegnaYet bf6d5614ac 门店号管理接口 6 years ago
Caps 9847cf4f9e 客户回调接口 6 years ago
Caps 82a9c5ade5 账户权限管理 6 years ago
Caps a453f43e1b 账户权限管理 6 years ago
LegnaYet 1753712259 配置文件修改 6 years ago
kevin jiang a992b75005 添加企业微信功能代码。 6 years ago
kevin jiang 78c642402b 初始导入。 6 years ago