784 Commits (dev)
 

Author SHA1 Message Date
kevin jiang 5e192fa3da Merge branch 'master' into feature/20200531 5 years ago
kevin jiang 68ba8d704e Merge branch 'feature/20200402_init_dev' 5 years ago
kevin jiang 57bb7048cf 启动报错问题修改。 5 years ago
yechenhao 299aa09f2f 删除客户导购关系 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
yechenhao 85ad920b2e 删除客户导购关系 5 years ago
yechenhao 03880dae18 删除客户导购关系 5 years ago
root 389a737c52 Merge remote-tracking branch 'remotes/src/dev_0531' into dev
# Conflicts:
#	pom.xml
5 years ago
root 9a4c44c872 修复tomcat不能运行,修改redis和mysql参数 5 years ago
kevin jiang 28c65c13c1 Merge branch 'feature/20200402_init_dev' 5 years ago
kevin jiang 752a417896 优化接口。 5 years ago
kevin jiang acea52a01c 优化接口。 5 years ago
kevin jiang e4067e7703 优化接口。 5 years ago
郑皇 e7e13073ac 1 5 years ago
kevin jiang d27a23905e 优化手机端首页和好友列表接口。 5 years ago
kevin jiang 3f0d76d70f 优化手机端首页和好友列表接口。 5 years ago
kevin jiang 36dcef8b84 优化手机端首页和好友列表接口。 5 years ago
郑皇 e31a167b45 1 5 years ago
zyy fabc6dbca4 排除tomcat依赖 5 years ago
zyy 3ebcefc0b5 排除tomcat依赖 5 years ago
郑皇 9df9cb973d 1 5 years ago
root e447ef3298 Merge branch 'feature/20200531' into dev_0531 5 years ago
郑皇 743172b71d 1 5 years ago
yechenhao fda8fd518c 删除客户导购关系 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
yechenhao b45a69b159 修改 5 years ago
yechenhao 45cf9bb8fb 更新好友 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
郑皇 b3cc51daad 1 5 years ago
郑皇 f94380c961 1 5 years ago
kevin jiang 48fe910e36 Merge branch 'feature/20200402_init_dev' 5 years ago
kevin jiang cd225ab9d1 test 5 years ago
yechenhao 3d21b06a23 删除客户导购关系 5 years ago
kevin jiang 1b2c4dda74 修改首页总数,读取通讯录账号。 5 years ago
郑皇 c8f4000b0a 1 5 years ago
kevin jiang 847ef92b2d mapper date时间修改。 5 years ago
yechenhao 0d6eb8ad03 删除客户导购关系 5 years ago
LegnaYet 1f70274f5c 门店号管理 5 years ago
kevin jiang ee86a02690 redis 5 years ago
yechenhao ed4e66ddfb 删除客户导购关系 5 years ago
yechenhao a3f09adc75 删除客户导购关系 5 years ago
yechenhao 3c2cb9557f 添加时间 5 years ago
root 6af2ab0b32 Merge remote-tracking branch 'remotes/origin/feature/20200514_version' into dev 5 years ago
yechenhao f0aeb7f5f4 删除客户导购关系 5 years ago
yechenhao eb655e1d22 Redis 5 years ago
yechenhao 7d4c86c846 删除客户导购关系 5 years ago
yechenhao 0b667f4acb 改为set 5 years ago
kevin jiang f51ce39cab redis 5 years ago
LegnaYet fc0297fdec 门店号管理 5 years ago
zhenghuang c5f052ed43 定时器,欢迎语 5 years ago