曾谨 / EssaAuto | GitLab

Merged
Merge Request #2 · created by 曾谨 2018-11-05 10:45:43 UTC

Dev master

From dev_master into master

1 participants

Link here
曾谨 @zengjin 2018-11-05 10:45:51 UTC
Status changed to merged
Write

Preview

_Status changed to merged_ Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach images (JPG, PNG, GIF) by dragging & dropping or selecting them.

Cancel

Choose File ...
Link here
曾谨 @zengjin 2018-11-05 10:45:51 UTC
mentioned in commit cae1f650db1c3e7c64b4087a98304088e0d33829
Write

Preview

_mentioned in commit cae1f650db1c3e7c64b4087a98304088e0d33829_ Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach images (JPG, PNG, GIF) by dragging & dropping or selecting them.

Cancel

Choose File ...

Votes

0 up

0 down

05 Nov, 2018

4 commits

e747aeb0 免定金方式bug修改 Browse Code »

zengjin
2018-11-05 18:22:12 +0800
fd314991 原厂商品和市场商品建档增加输入商品长宽高、包装长宽高 Browse Code »

toby5221
2018-11-05 18:19:29 +0800
a3e6db11 修改bug Browse Code »

zengjin
2018-11-05 17:29:08 +0800
3b58efeb 调试完成 Browse Code »

zengjin
2018-11-05 12:04:28 +0800

02 Nov, 2018

3 commits

81a4681f 修改时间工具，还有船务相关 Browse Code »

zengjin
2018-11-02 16:31:39 +0800
887b8a0e Merge branch 'dev_master' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_master Browse Code »

zengjin
2018-11-02 15:11:21 +0800
3f06ee1c 修改时间工具，还有船务相关 Browse Code »

zengjin
2018-11-02 15:11:08 +0800

01 Nov, 2018

2 commits

71af73f2 lana update Browse Code »

78@qq.com
2018-11-01 18:05:58 +0800
aaa54ba4 通知装柜提交 Browse Code »

yang
2018-11-01 11:41:35 +0800

31 Oct, 2018

5 commits

687cafe9 船务 Browse Code »

hanlei
2018-10-31 16:16:28 +0800
ba50132d Merge branch 'dev_master' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_master Browse Code »

hanlei
2018-10-31 16:13:40 +0800
d688c3f8 船务 Browse Code »

hanlei
2018-10-31 16:13:23 +0800
1458ba60 组装用例 Browse Code »

zengjin
2018-10-31 15:58:27 +0800
d7f15c1c 提交并且覆盖之前的 Browse Code »

zengjin
2018-10-31 15:09:31 +0800

30 Oct, 2018

7 commits

0571f514 增加swing新增开发商品 Browse Code »

zengjin
2018-10-30 16:41:29 +0800
46c08699 Merge branch 'dev_test' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_test ... Browse Code »
```
# Conflicts:
#	src/main/java/com/essa/pageObject/HomePage.java
```
zengjin
2018-10-30 15:32:09 +0800
b2af39f8 新增开发商品 Browse Code »

zengjin
2018-10-30 14:56:09 +0800
102bbcff 注释掉装柜图片上传的步骤 Browse Code »

toby5221
2018-10-30 14:02:46 +0800
8ea5be89 修改定义 Browse Code »

toby5221
2018-10-30 13:56:09 +0800
03a9832d Merge branch 'dev_test' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_test ... Browse Code »
```
# Conflicts:
#	src/main/java/com/essa/pageObject/HomePage.java
```
toby5221
2018-10-30 13:48:37 +0800
0e4d02cb 增加装柜任务形成现存尾货 Browse Code »

toby5221
2018-10-30 13:45:57 +0800

29 Oct, 2018

6 commits

5d044c02 增加发单中心的列表动态等待 Browse Code »

huangyuanbo914@163.com
2018-10-29 18:07:37 +0800
a3ecf544 调整结构 Browse Code »

huangyuanbo914@163.com
2018-10-29 11:08:42 +0800
22a05aab Merge branch 'dev_test' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_test ... Browse Code »
```
# Conflicts:
#	src/main/java/com/essa/pageObject/HomePage.java
```
huangyuanbo914@163.com
2018-10-29 10:44:01 +0800
492c1c63 结构调整 Browse Code »

huangyuanbo914@163.com
2018-10-29 10:40:52 +0800
bf143b86 调整结构 Browse Code »

huangyuanbo914@163.com
2018-10-29 10:38:15 +0800
d2051686 删除一些不要用的类和修改一些类的位置 Browse Code »

zengjin
2018-10-29 10:34:28 +0800

26 Oct, 2018

16 commits

a90375bd huangyuanbo Browse Code »

huangyuanbo914@163.com
2018-10-26 18:50:31 +0800
3cd81127 调整结构 Browse Code »

huangyuanbo914@163.com
2018-10-26 18:23:14 +0800
a294c18e 修改设置装柜的返回值 Browse Code »

zengjin
2018-10-26 18:20:49 +0800
1b34d9af Merge branch 'yb' into 'dev_test' ... Browse Code »
```
Yb

See merge request !1
```
huangyuanbo
2018-10-26 18:12:26 +0800
06fc8ada 123 Browse Code »

huangyuanbo914@163.com
2018-10-26 18:08:18 +0800
0b640e79 修改设置装柜的返回值 Browse Code »

zengjin
2018-10-26 17:54:09 +0800
438eca07 添加断言 Browse Code »

toby5221
2018-10-26 17:42:50 +0800
9cbca2e2 create yb Browse Code »

huangyuanbo914@163.com
2018-10-26 17:40:06 +0800
9e8e2bb1 Merge remote-tracking branch 'origin/dev_test' into dev_test Browse Code »

zengjin
2018-10-26 15:33:28 +0800
a524812a idea增加epd环境 Browse Code »

zengjin
2018-10-26 15:32:56 +0800
a0824d2d 啊啊啊 Browse Code »

toby5221
2018-10-26 14:57:31 +0800
2e89392c Merge branch 'dev_test' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_test Browse Code »

suweicheng
2018-10-26 14:07:47 +0800
d6c2eca9 开发梳理； Browse Code »

suweicheng
2018-10-26 14:07:35 +0800
d3c5a77a idea第一次提交 Browse Code »

zengjin
2018-10-26 14:06:29 +0800
ca59c24b 开发梳理； Browse Code »

suweicheng
2018-10-26 13:52:28 +0800
a619f762 开发梳理； Browse Code »

suweicheng
2018-10-26 10:38:18 +0800

25 Oct, 2018

5 commits

a8f68b31 开发梳理； Browse Code »

suweicheng
2018-10-25 18:47:20 +0800
79149350 开发梳理； Browse Code »

suweicheng
2018-10-25 18:32:05 +0800
27d9a429 开发梳理； Browse Code »

suweicheng
2018-10-25 16:48:07 +0800
84b19956 gitignore Browse Code »

suweicheng
2018-10-25 16:46:52 +0800
cdc2269d 删除之前的代码； Browse Code »

suweicheng
2018-10-25 16:44:12 +0800