xtrade / order-service · Commits

23 Apr, 2020

1 commit

code review
1f0332f0

miaoguoxin authored
2020-04-23 09:15:49 +0800
Browse Code »

22 Apr, 2020

39 commits

code review
ba0b5548

miaoguoxin authored
2020-04-22 17:40:50 +0800
Browse Code »
code review
ef55ce57

miaoguoxin authored
2020-04-22 17:40:38 +0800
Browse Code »
Merge remote-tracking branch 'origin/master'
0a75e26b

miaoguoxin authored
2020-04-22 17:38:20 +0800
Browse Code »
code review
8a19e696

miaoguoxin authored
2020-04-22 17:38:08 +0800
Browse Code »
订单默认创建者更改
d53e2b23

zhangxing authored
2020-04-22 17:36:48 +0800
Browse Code »
orderservice 基础创建订单模型后期添加其他功能
22e8f6ef

zhangxing authored
2020-04-22 17:24:01 +0800
Browse Code »
Merge remote-tracking branch 'origin/master'
c96d2da2

miaoguoxin authored
2020-04-22 17:20:53 +0800
Browse Code »
code review
1c737cf1

miaoguoxin authored
2020-04-22 17:20:45 +0800
Browse Code »
商品xml
e033587d

dengj authored
2020-04-22 17:12:37 +0800
Browse Code »
dot
0008d0e7

zhangxing authored
2020-04-22 16:53:23 +0800
Browse Code »
去掉不必要的方法
64e53259

zhangxing authored
2020-04-22 16:52:51 +0800
Browse Code »
Merge branch 'master' of http://git3.nong12.com/xtrade/order-service.git
a47191dd

zhangxing authored
2020-04-22 16:47:06 +0800
Browse Code »
builder相关
7a581a33

zhangxing authored
2020-04-22 16:46:59 +0800
Browse Code »
Merge remote-tracking branch 'origin/master'
7fb066e0

miaoguoxin authored
2020-04-22 16:45:58 +0800
Browse Code »
优化
efca6869

miaoguoxin authored
2020-04-22 16:45:50 +0800
Browse Code »
去掉get 全封闭
f2d04002

zhangxing authored
2020-04-22 16:39:01 +0800
Browse Code »
Merge remote-tracking branch 'origin/master'
9a830fa9

miaoguoxin authored
2020-04-22 16:35:26 +0800
Browse Code »
根配置
785f61ed

miaoguoxin authored
2020-04-22 16:35:18 +0800
Browse Code »
Merge branch 'master' of http://git3.nong12.com/xtrade/order-service.git
98671df3

zhangxing authored
2020-04-22 16:35:04 +0800
Browse Code »
去掉set操作不允许set
e144b9a7

zhangxing authored
2020-04-22 16:34:57 +0800
Browse Code »
根配置
19e5b31d

miaoguoxin authored
2020-04-22 16:34:52 +0800
Browse Code »
merchant优化
78b38905

miaoguoxin authored
2020-04-22 16:33:08 +0800
Browse Code »
Merge branch 'master' of http://git3.nong12.com/xtrade/order-service.git
26e8940c

zhangxing authored
2020-04-22 16:27:25 +0800
Browse Code »
[代码优化]
699e884e

zhangxing authored
2020-04-22 16:27:19 +0800
Browse Code »
Merge branch 'master' of http://git3.nong12.com/xtrade/order-service
482e60c7

yangfan authored
2020-04-22 16:25:47 +0800
Browse Code »
shop/category dao.xml编写
cce2ed15

yangfan authored
2020-04-22 16:25:38 +0800
Browse Code »
Merge remote-tracking branch 'origin/master'
3e9131cc

miaoguoxin authored
2020-04-22 16:24:22 +0800
Browse Code »
MerchantDao.xml时间问题
e0ed8c52

miaoguoxin authored
2020-04-22 16:24:11 +0800
Browse Code »
Merge branch 'master' of http://git3.nong12.com/xtrade/order-service.git
e12eecdc

zhangxing authored
2020-04-22 16:23:46 +0800
Browse Code »
[修改order数据生成]
608b65ce

zhangxing authored
2020-04-22 16:23:39 +0800
Browse Code »
.
08b18804

yangfan authored
2020-04-22 16:00:41 +0800
Browse Code »
Merge branch 'master' of http://git3.nong12.com/xtrade/order-service
2f9f2b83

yangfan authored
2020-04-22 15:57:46 +0800
Browse Code »
shop
1f52991a

yangfan authored
2020-04-22 15:54:38 +0800
Browse Code »
Merge remote-tracking branch 'origin/master'
4833e3c3

miaoguoxin authored
2020-04-22 15:53:36 +0800
Browse Code »
统一实体名称
8333880b

miaoguoxin authored
2020-04-22 15:53:29 +0800
Browse Code »
[builer]
9d22c59e

zhangxing authored
2020-04-22 15:51:41 +0800
Browse Code »
[提交order]
f4643fec

zhangxing authored
2020-04-22 15:50:42 +0800
Browse Code »
统一实体名称
a3eba571

miaoguoxin authored
2020-04-22 15:45:35 +0800
Browse Code »
Merge remote-tracking branch 'origin/master' ...
acf76e29
```
# Conflicts:
#	src/main/java/com/diligrp/xtrade/product/service/impl/CategoryServiceImpl.java
```
miaoguoxin authored
2020-04-22 15:38:49 +0800
Browse Code »