Commit Graph

1081 Commits

Author SHA1 Message Date
kuang.yifei@iwhalecloud.com aef73ce907 fix 2022-06-07 17:08:25 +08:00
HH 1237d578d1 Merge remote-tracking branch 'origin/master' 2022-06-07 16:37:14 +08:00
HH ffc1d6c177 师傅服务类目接口 2022-06-07 16:37:06 +08:00
kuang.yifei@iwhalecloud.com a96ab58e1e Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-07 16:23:49 +08:00
kuang.yifei@iwhalecloud.com c4844fa9cf fix 2022-06-07 16:23:39 +08:00
HH b701516896 Merge remote-tracking branch 'origin/master' 2022-06-07 16:00:53 +08:00
HH d2ed20b04d 师傅接单区域 Controller 2022-06-07 16:00:45 +08:00
kuang.yifei@iwhalecloud.com 9a6b4b2e7d 消费者订单接口 2022-06-07 15:55:04 +08:00
kuang.yifei@iwhalecloud.com d0626c36b5 新增商城端-热门商品接口 2022-06-07 10:33:11 +08:00
donqi 87d81b0547 goods列表补全商品规格列表 2022-06-07 10:04:30 +08:00
kuang.yifei@iwhalecloud.com a9d8d7e1f1 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-06 17:52:10 +08:00
kuang.yifei@iwhalecloud.com eb6d85e97c 新增商城端-热门类目接口 2022-06-06 17:52:00 +08:00
HH 4355e6dc91 师傅接单区域 Service 和 Mapper 2022-06-06 17:23:32 +08:00
kuang.yifei@iwhalecloud.com 8735f748d5 师傅端 更新师傅服务商、供应商 2022-06-06 13:53:11 +08:00
HH 830f8136cc Merge remote-tracking branch 'origin/master' 2022-06-06 11:12:00 +08:00
HH b688f0f525 分公司类目增加字段 2022-06-06 11:11:51 +08:00
donqi f698f94c6a 问题修复 2022-06-06 10:58:00 +08:00
kuang.yifei@iwhalecloud.com 54da5e3c98 新增商品信息 2022-06-02 14:37:13 +08:00
kuang.yifei@iwhalecloud.com 399a1af0a8 小程序端订单+小程序端财务单 2022-06-01 23:45:50 +08:00
kuang.yifei@iwhalecloud.com ee2d5ea391 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-01 22:26:04 +08:00
kuang.yifei@iwhalecloud.com 8d94b1fab1 财务列表时间筛选 2022-06-01 22:25:50 +08:00
但星霖 807a2256a7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java
#	ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java
#	ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java
2022-06-01 22:15:47 +08:00
但星霖 27b598c6d6 订单Vo数据/代码页面补充。 2022-06-01 22:14:02 +08:00
kuang.yifei@iwhalecloud.com 2879ae482c Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-01 22:06:42 +08:00
kuang.yifei@iwhalecloud.com 4cd21aa340 提供给前台的财务单 2022-06-01 22:06:29 +08:00
donqi e44483498d 修改团队成员备注接口开发 2022-06-01 21:29:28 +08:00
kuang.yifei@iwhalecloud.com 1f84c777a8 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-01 18:16:25 +08:00
kuang.yifei@iwhalecloud.com 0212e22984 收入和支出统计 2022-06-01 18:11:29 +08:00
donqi d21a38bad1 团队及个人信息查询,字段补充 2022-06-01 18:07:56 +08:00
kuang.yifei@iwhalecloud.com fa166fa42b fix import 2022-06-01 16:56:09 +08:00
HH 5c34b2ad56 Merge remote-tracking branch 'origin/master' 2022-06-01 16:30:01 +08:00
HH 2423fd9fe2 撤销支付接口 2022-06-01 16:29:52 +08:00
kuang.yifei@iwhalecloud.com 9443a8ca24 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-01 16:21:09 +08:00
kuang.yifei@iwhalecloud.com 4fbe5a0698 师傅团队 2022-06-01 16:20:50 +08:00
但星霖 4d9d30bde0 订单Vo数据/代码页面补充。 2022-06-01 15:48:19 +08:00
但星霖 ea52a9b469 订单Vo数据/代码页面补充。 2022-06-01 15:41:30 +08:00
但星霖 c448ab8a6d Merge remote-tracking branch 'origin/master' 2022-06-01 14:51:09 +08:00
但星霖 07fde0c962 订单Vo数据/代码页面补充。 2022-06-01 14:50:58 +08:00
kuang.yifei@iwhalecloud.com 2bb9d1ee0a fix bug 2022-06-01 13:48:36 +08:00
kuang.yifei@iwhalecloud.com 6400095500 fix bug 2022-06-01 00:29:00 +08:00
kuang.yifei@iwhalecloud.com 6a68a6ae44 发布商品批量新增bug 商品图片少了类型字段入库 2022-06-01 00:18:46 +08:00
kuang.yifei@iwhalecloud.com ca4773db99 批量发布商品+转派初版 2022-05-31 23:27:30 +08:00
HH 24a4872ccf Merge remote-tracking branch 'origin/master' 2022-05-31 20:55:18 +08:00
HH 98bef1400a 1.撤销支付2.重新整理回调 2022-05-31 20:55:09 +08:00
但星霖 c28e975288 Merge remote-tracking branch 'origin/master' 2022-05-31 14:18:43 +08:00
但星霖 c4c1cbbc7d 订单Vo补充。 2022-05-31 14:18:33 +08:00
kuang.yifei@iwhalecloud.com 55dc415d7c 干掉没用的变量 2022-05-31 13:57:37 +08:00
kuang.yifei@iwhalecloud.com 6c88cd78f9 多级分销+平台扣点+截留扣点生成细单 2022-05-30 15:40:57 +08:00
kuang.yifei@iwhalecloud.com b074e3fbce 通过枚举替换if-else 2022-05-30 11:01:32 +08:00
kuang.yifei@iwhalecloud.com f5202904f9 解决回调的部分,改为策略模式 2022-05-30 10:42:40 +08:00