aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git statusw
git: 'statusw' is not a git command. See 'git --help'.
The most similar command is
status
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ npm run start
> backend@0.0.1 start F:\COMPANY\backend
> nodemon ./bin/www
[nodemon] 1.18.10
[nodemon] to restart at any time, enter `rs`
[nodemon] watching: *.*
[nodemon] starting `node ./bin/www`
2019-02-26T03:03:25.429Z [info]: set env to development
2019-02-26T03:03:27.405Z [info]: connecting to development db...
2019-02-26T03:03:29.210Z [debug]: Listening port 3000 on 127.0.0.1
2019-02-26T03:03:29.305Z [info]: Succeed to connect to db!!
git status
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git reset --hard 8911f879fcef3fd1
HEAD is now at 8911f87 Merge branch
'dev' of gitlab.com:51/backend into
dev
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git reflog --pretty-onelien
fatal: unrecognized argument: --pretty-onelien
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git reflog --pretty-oneline
fatal: unrecognized argument: --pretty-oneline
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git reflog --pretty--online
fatal: unrecognized argument: --pretty--online
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git reflog --oneline
8911f87 (HEAD -> dev) HEAD@{0}: reset: moving to 8911f879fcef3fd1
8911f87 (HEAD -> dev) HEAD@{1}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{2}: reset: moving to origin/master
a77a419 HEAD@{3}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{4}: reset: moving to origin/master
df891d4 HEAD@{5}: reset: moving to df891d4c18
df891d4 HEAD@{6}: commit: 添加字段
46cc16d HEAD@{7}: commit: fix 回购公
司存储历史纪录方法
b55444c HEAD@{8}: commit: 添加取得回
购方关联的监管仓接口
6b646ba HEAD@{9}: commit: fix 获取回
购方历史
4e989ff HEAD@{10}: commit: fix 修改
回购能力方法
0ad229d HEAD@{11}: commit: 修改表结
构 业务区域和货品种类字段
a92fe05 HEAD@{12}: commit: fix lint
err
d030123 HEAD@{13}: commit: fix 获取
担保方监管仓返回结构
:
8911f87 (HEAD -> dev) HEAD@{0}: reset: moving to 8911f879fcef3fd1
8911f87 (HEAD -> dev) HEAD@{1}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{2}: reset: moving to origin/master
a77a419 HEAD@{3}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{4}: reset: moving to origin/master
df891d4 HEAD@{5}: reset: moving to df891d4c18
df891d4 HEAD@{6}: commit: 添加字段
46cc16d HEAD@{7}: commit: fix 回购公
司存储历史纪录方法
b55444c HEAD@{8}: commit: 添加取得回
购方关联的监管仓接口
8911f87 (HEAD -> dev) HEAD@{0}: reset: moving to 8911f879fcef3fd1
8911f87 (HEAD -> dev) HEAD@{1}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{2}: reset: moving to origin/master
a77a419 HEAD@{3}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{4}: reset: moving to origin/master
段 段 段 段 段 段 段 段 段 段 段段 段 段 段 段 段 段 段 段 段 段 段
46cc16d HEAD@{7}: commit: fix 回购公司存储历史纪录方法
b55444c HEAD@{8}: commit: 添加取得回购方关联的监管仓接口
6b646ba HEAD@{9}: commit: fix 获取回购方历史
4e989ff HEAD@{10}: commit: fix 修改
回购能力方法
0ad229d HEAD@{11}: commit: 修改表结
构 业务区域和货品种类字段
a92fe05 HEAD@{12}: commit: fix lint err
d030123 HEAD@{13}: commit: fix 获取
担保方监管仓返回结构
:
8911f87 (HEAD -> dev) HEAD@{0}: reset: moving to 8911f879fc 8911f879fcef3fd1
8911f87 (HEAD -> dev) HEAD@{1}: pull: Merge made by the 're by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{2}: reset: moving to origin/mto origin/master
a77a419 HEAD@{3}: pull: Merge made by the 'recursive' stratsive' strategy.
34c5640 (origin/master) HEAD@{4}: reset: moving to origin/mto origin/master
df891d4 HEAD@{5}: reset: moving to df891d4c18
df891d4 HEAD@{6}: commit: 添加字段
46cc16d HEAD@{7}: commit: fix 回购公司存储历史纪录方法
b55444c HEAD@{8}: commit: 添加取得回购方关联的监管仓接口
6b646ba HEAD@{9}: commit: fix 获取回购方历史
4e989ff HEAD@{10}: commit: fix 修改回购能力方法
0ad229d HEAD@{11}: commit: 修改表结构 业务区域和货品种类字
段
a92fe05 HEAD@{12}: commit: fix lint err
d030123 HEAD@{13}: commit: fix 获取担保方监管仓 回结构
6e93220 HEAD@{14}: commit: fix 担保方获取监管仓 页
d82fa59 HEAD@{15}: commit: fix 监管仓库查询问题
4e49822 HEAD@{16}: commit: 添加 address 字段
0f06459 HEAD@{17}: commit: 添加回购方历史记录列 获取，增删
改，修改增删改回购能力，
5df8e25 HEAD@{18}: commit: 添加取得某担保公司下 的监管仓功
能， 完善获得某贷款产品文档
f7c697d HEAD@{19}: commit: 修改company name
:...skipping...
8911f87 (HEAD -> dev) HEAD@{0}: reset: moving to 8911f879fc 8911f879fcef3fd1
8911f87 (HEAD -> dev) HEAD@{1}: pull: Merge made by the 're by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{2}: reset: moving to origin/mto origin/master
a77a419 HEAD@{3}: pull: Merge made by the 'recursive' stratsive' strategy.
34c5640 (origin/master) HEAD@{4}: reset: moving to origin/mto origin/master
df891d4 HEAD@{5}: reset: moving to df891d4c18
df891d4 HEAD@{6}: commit: 添加字段
46cc16d HEAD@{7}: commit: fix 回购公司存储历史纪录方法
b55444c HEAD@{8}: commit: 添加取得回购方关联的监管仓接口
6b646ba HEAD@{9}: commit: fix 获取回购方历史
4e989ff HEAD@{10}: commit: fix 修改回购能力方法
0ad229d HEAD@{11}: commit: 修改表结构 业务区域和货品种类字
段
a92fe05 HEAD@{12}: commit: fix lint err
d030123 HEAD@{13}: commit: fix 获取担保方监管仓 回结构
6e93220 HEAD@{14}: commit: fix 担保方获取监管仓 页
d82fa59 HEAD@{15}: commit: fix 监管仓库查询问题
4e49822 HEAD@{16}: commit: 添加 address 字段
0f06459 HEAD@{17}: commit: 添加回购方历史记录列 获取，增删
改，修改增删改回购能力，
5df8e25 HEAD@{18}: commit: 添加取得某担保公司下 的监管仓功
能， 完善获得某贷款产品文档
f7c697d HEAD@{19}: commit: 修改company name
430ff05 HEAD@{20}: commit: fix apidoc error
1262047 HEAD@{21}: commit: 修复 apidoc
9932fb4 HEAD@{22}: commit: 修改两处表结构，修复 个update更
新问题，修改担保方状态， 修改 担保方历史记录添加和能力添加
5106054 HEAD@{23}: commit: fix bug 获取担保方详
5c94cfb HEAD@{24}: commit: 修改被误改的business_history表结
构
e6131e6 HEAD@{25}: pull: Merge made by the 'recursive' strarsive' strategy.
16b51e3 HEAD@{26}: commit: 添加资金方历史纪录增 改功能
2b50276 HEAD@{27}: commit: 取得资金方发布的所有 款产品
083614f HEAD@{28}: pull: Fast-forward
9c92733 HEAD@{29}: commit: fix apidoc Apisuccess 报错
3f03329 HEAD@{30}: commit: 增加银行定义字段和相 正则
e2aea33 HEAD@{31}: commit: 添加删除某条资金方历 记录
c9dbac4 HEAD@{32}: commit: 添加和修改接口 完成 增 查看 放
款历史信息
43e9b69 HEAD@{33}: commit: 增加添加放款历史记录, 修改获取资
金放款记录方法, 修改创建资金方， 添加完成状态插 和判断
b43ea2a HEAD@{34}: commit: 修改获取放款信息
bcab0fd HEAD@{35}: pull: Merge made by the 'recursive' strarsive' strategy.
c86b981 HEAD@{36}: commit: 修改数据库 更改资金方 添加loan表
中字段
ea1c1cf HEAD@{37}: pull: Merge made by the 'recursive' strarsive' strategy.
396e2b6 HEAD@{38}: commit: 回购能力的增删改查
572c027 HEAD@{39}: commit: 添加回购能力的增删改
25ea8fb HEAD@{40}: commit: fix /api/fund/:id
73e8c59 HEAD@{41}: commit: 换成 _id
...skipping...
8911f87 (HEAD -> dev) HEAD@{0}: reset: moving to 8911f879fc 8911f879fcef3fd1
8911f87 (HEAD -> dev) HEAD@{1}: pull: Merge made by the 're by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{2}: reset: moving to origin/mto origin/master
a77a419 HEAD@{3}: pull: Merge made by the 'recursive' stratsive' strategy.
34c5640 (origin/master) HEAD@{4}: reset: moving to origin/mto origin/master
df891d4 HEAD@{5}: reset: moving to df891d4c18
df891d4 HEAD@{6}: commit: 添加字段
46cc16d HEAD@{7}: commit: fix 回购公司存储历史纪录方法
b55444c HEAD@{8}: commit: 添加取得回购方关联的监管仓接口
6b646ba HEAD@{9}: commit: fix 获取回购方历史
4e989ff HEAD@{10}: commit: fix 修改回购能力方法
0ad229d HEAD@{11}: commit: 修改表结构 业务区域和货品种类字
段
a92fe05 HEAD@{12}: commit: fix lint err
d030123 HEAD@{13}: commit: fix 获取担保方监管仓8911f87 (HEAD -> dev) HEAD@{1}: pull: Merge made by the 'recursive' strategy.34c5640 (origin/master) HEAD@{2}: reset: moving
to origin/master
a77a419 HEAD@{3}: pull: Merge made by the 'recursive' strategy.34c5640 (origin/master) HEAD@{4}: reset: moving
to origin/master
df891d4 HEAD@{5}: reset: moving to df891d4c18df891d4 HEAD@{6}: commit: 添加字段
46cc16d HEAD@{7}: commit: fix 回购公司存储历史纪
录方法
b55444c HEAD@{8}: commit: 添加取得回购方关联的监
管仓接口
6b646ba HEAD@{9}: commit: fix 获取回购方历史4e989ff HEAD@{10}: commit: fix 修改回购能力方法
0ad229d HEAD@{11}: commit: 修改表结构 业务区域和货品种类字
段
a92fe05 HEAD@{12}: commit: fix lint errd030123 HEAD@{13}: commit: fix 获取担保方监管仓
返回结构
6e93220 HEAD@{14}: commit: fix 担保方获取监管仓分页
d82fa59 HEAD@{15}: commit: fix 监管仓库查询问题4e49822 HEAD@{16}: commit: 添加 address 字段
0f06459 HEAD@{17}: commit: 添加回购方历史记录列表获取，增删改，修改增删改回购能力，
5df8e25 HEAD@{18}: commit: 添加取得某担保公司下
面的监管仓功能， 完善获得某贷款产品文档f7c697d HEAD@{19}: commit: 修改company name
430ff05 HEAD@{20}: commit: fix apidoc error1262047 HEAD@{21}: commit: 修复 apidoc
9932fb4 HEAD@{22}: commit: 修改两处表结构，修复一个update更新问题，修改担保方状态， 修改 担保方
历史记录添加和能力添加5106054 HEAD@{23}: commit: fix bug 获取担保方详
情
5c94cfb HEAD@{24}: commit: 修改被误改的business_history表结构
e6131e6 HEAD@{25}: pull: Merge made by the 'recursive' strategy.
16b51e3 HEAD@{26}: commit: 添加资金方历史纪录增
删改功能2b50276 HEAD@{27}: commit: 取得资金方发布的所有
贷款产品083614f HEAD@{28}: pull: Fast-forward
9c92733 HEAD@{29}: commit: fix apidoc Apisuccess 报错3f03329 HEAD@{30}: commit: 增加银行定义字段和相
关正则
e2aea33 HEAD@{31}: commit: 添加删除某条资金方历
史记录
c9dbac4 HEAD@{32}: commit: 添加和修改接口 完成
新增 查看 放款历史信息
43e9b69 HEAD@{33}: commit: 增加添加放款历史记录, 修改获取资金放款记录方法, 修改创建资金方， 添加
完成状态插入和判断
b43ea2a HEAD@{34}: commit: 修改获取放款信息
bcab0fd HEAD@{35}: pull: Merge made by the 'recursive' strategy.
c86b981 HEAD@{36}: commit: 修改数据库 更改资金方
添加loan表中字段
ea1c1cf HEAD@{37}: pull: Merge made by the 'recursive' strategy.
396e2b6 HEAD@{38}: commit: 回购能力的增删改查
572c027 HEAD@{39}: commit: 添加回购能力的增删改
25ea8fb HEAD@{40}: commit: fix /api/fund/:id
73e8c59 HEAD@{41}: commit: 换成 _id
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend
(dev)
$
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend
(dev)
$ git reflog --oneline
8911f87 (HEAD -> dev) HEAD@{0}: reset: moving to 8911f879fcef3fd1
8911f87 (HEAD -> dev) HEAD@{1}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{2}: reset: moving
to origin/master
a77a419 HEAD@{3}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{4}: reset: moving
to origin/master
df891d4 HEAD@{5}: reset: moving to df891d4c18
df891d4 HEAD@{6}: commit: 添加字段
46cc16d HEAD@{7}: commit: fix 回购公司存储历史纪
录方法
b55444c HEAD@{8}: commit: 添加取得回购方关联的监
管仓接口
6b646ba HEAD@{9}: commit: fix 获取回购方历史
4e989ff HEAD@{10}: commit: fix 修改回购能力方法
0ad229d HEAD@{11}: commit: 修改表结构 业务区域和
货品种类字段
a92fe05 HEAD@{12}: commit: fix lint err
d030123 HEAD@{13}: commit: fix 获取担保方监管仓
返回结构
6e93220 HEAD@{14}: commit: fix 担保方获取监管仓
分页
d82fa59 HEAD@{15}: commit: fix 监管仓库查询问题
4e49822 HEAD@{16}: commit: 添加 address 字段
0f06459 HEAD@{17}: commit: 添加回购方历史记录列
表获取，增删改，修改增删改回购能力，
5df8e25 HEAD@{18}: commit: 添加取得某担保公司下
面的监管仓功能， 完善获得某贷款产品文档
f7c697d HEAD@{19}: commit: 修改company name
430ff05 HEAD@{20}: commit: fix apidoc error
1262047 HEAD@{21}: commit: 修复 apidoc
9932fb4 HEAD@{22}: commit: 修改两处表结构，修复
一个update更新问题，修改担保方状态， 修改 担保方
历史记录添加和能力添加
5106054 HEAD@{23}: commit: fix bug 获取担保方详
情
5c94cfb HEAD@{24}: commit: 修改被误改的business_history表结构
e6131e6 HEAD@{25}: pull: Merge made by the 'recursive' strategy.
16b51e3 HEAD@{26}: commit: 添加资金方历史纪录增
删改功能
2b50276 HEAD@{27}: commit: 取得资金方发布的所有
贷款产品
083614f HEAD@{28}: pull: Fast-forward
9c92733 HEAD@{29}: commit: fix apidoc Apisuccess 报错
3f03329 HEAD@{30}: commit: 增加银行定义字段和相
关正则
e2aea33 HEAD@{31}: commit: 添加删除某条资金方历
史记录
c9dbac4 HEAD@{32}: commit: 添加和修改接口 完成
新增 查看 放款历史信息
43e9b69 HEAD@{33}: commit: 增加添加放款历史记录,...skipping...
8911f87 (HEAD -> dev) HEAD@{0}: reset: moving to 8911f879fcef3fd1
8911f87 (HEAD -> dev) HEAD@{1}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{2}: reset: moving
to origin/master
a77a419 HEAD@{3}: pull: Merge made by the 'recursive' strategy.
34c5640 (origin/master) HEAD@{4}: reset: moving
to origin/master
df891d4 HEAD@{5}: reset: moving to df891d4c18
df891d4 HEAD@{6}: commit: 添加字段
46cc16d HEAD@{7}: commit: fix 回购公司存储历史纪
录方法
b55444c HEAD@{8}: commit: 添加取得回购方关联的监
管仓接口
6b646ba HEAD@{9}: commit: fix 获取回购方历史
4e989ff HEAD@{10}: commit: fix 修改回购能力方法
0ad229d HEAD@{11}: commit: 修改表结构 业务区域和
货品种类字段
a92fe05 HEAD@{12}: commit: fix lint err
d030123 HEAD@{13}: commit: fix 获取担保方监管仓
返回结构
6e93220 HEAD@{14}: commit: fix 担保方获取监管仓
分页
d82fa59 HEAD@{15}: commit: fix 监管仓库查询问题
4e49822 HEAD@{16}: commit: 添加 address 字段
0f06459 HEAD@{17}: commit: 添加回购方历史记录列
表获取，增删改，修改增删改回购能力，
5df8e25 HEAD@{18}: commit: 添加取得某担保公司下
面的监管仓功能， 完善获得某贷款产品文档
f7c697d HEAD@{19}: commit: 修改company name
430ff05 HEAD@{20}: commit: fix apidoc error
1262047 HEAD@{21}: commit: 修复 apidoc
9932fb4 HEAD@{22}: commit: 修改两处表结构，修复
一个update更新问题，修改担保方状态， 修改 担保方
历史记录添加和能力添加
5106054 HEAD@{23}: commit: fix bug 获取担保方详
情
5c94cfb HEAD@{24}: commit: 修改被误改的business_history表结构
e6131e6 HEAD@{25}: pull: Merge made by the 'recursive' strategy.
16b51e3 HEAD@{26}: commit: 添加资金方历史纪录增
删改功能
2b50276 HEAD@{27}: commit: 取得资金方发布的所有
贷款产品
083614f HEAD@{28}: pull: Fast-forward
9c92733 HEAD@{29}: commit: fix apidoc Apisuccess 报错
3f03329 HEAD@{30}: commit: 增加银行定义字段和相
关正则
e2aea33 HEAD@{31}: commit: 添加删除某条资金方历
史记录
c9dbac4 HEAD@{32}: commit: 添加和修改接口 完成
新增 查看 放款历史信息
43e9b69 HEAD@{33}: commit: 增加添加放款历史记录,
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend
(dev)
$ git log --oneline
8911f87 (HEAD -> dev) Merge branch 'dev' of gitlab.com:51/backend into dev
8769756 (origin/dev, origin/HEAD) 添加缺少字段status
3b05510 添加populte地址
104abc0 添加部分select 完成地址的populdate
eac3f0e 删除Order_approval数据定义，所有的资金方
审核订单数据保存在Pushed_order定义中。
4a74e5b 第三方系统集成封装代码。以及易泰链的封装
部分实现。抽象部分为草稿，需要根据更多的资金方和
核心企业系统情况完善。
772a312 重构pushed_order数据定义，approvaler改为
pusher，代表推送人。
44470dc 添加管理员代表核心企业操作的权限定义。
571f4bf 添加地址populate
325bfb0 第三方系统集成身份认证过程修复。
46cc16d fix 回购公司存储历史纪录方法
b55444c 添加取得回购方关联的监管仓接口
6b646ba fix 获取回购方历史
4e989ff fix 修改回购能力方法
0ad229d 修改表结构 业务区域和货品种类字段
a92fe05 fix lint err
d030123 fix 获取担保方监管仓返回结构
6e93220 fix 担保方获取监管仓分页
d82fa59 fix 监管仓库查询问题
4e49822 添加 address 字段
0f06459 添加回购方历史记录列表获取，增删改，修改
增删改回购能力，
5df8e25 添加取得某担保公司下面的监管仓功能， 完
善获得某贷款产品文档
f7c697d 修改company name
430ff05 fix apidoc error
1262047 修复 apidoc
9932fb4 修改两处表结构，修复一个update更新问题，
修改担保方状态， 修改 担保方历史记录添加和能力添
加
5106054 fix bug 获取担保方详情
5c94cfb 修改被误改的business_history表结构
e6131e6 Merge branch 'dev' of gitlab.com:51/backend into dev
16b51e3 添加资金方历史纪录增删改功能
7077eae 添加第三方集成身份验证代码。不需要登陆，
可以直接使用User和org中的secret与id直接调用相应
接口。
693c6e3 修复创建担保方接口错误导致的测试代码失败
。
91173d5 修改创建回购方Address注释参数的描述
fe4d061 修正创建担保方bug
1de4510 给User和Org添加Secret字段，用来做第三方
系统集成时的身份认证。
d970329 添加MD5方法，并在登陆时自适应明文密码和md5密码（非生产环境）。
94aab52 Merge branch 'dev' of https://gitlab.com/51/backend into dev
f3f91e4 担保方历史记录相关接口修改，删除business_history不必要的继承
2b50276 取得资金方发布的所有贷款产品
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend
(dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend
(dev)
$ git log\
>
commit 8911f879fcef3fd13194450682d6af4f59f5edc5 (HEAD -> dev)
Merge: 34c5640 8769756
Author: aocn <willion@sohu.com>
Date: Tue Feb 26 11:05:49 2019 +0800
Merge branch 'dev' of gitlab.com:51/backend into dev
commit 8769756dd67380d9a9c3aa0248a7ac90e53f7a24 (origin/dev, origin/HEAD)
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 10:26:48 2019 +0800
添加缺少字段status
commit 3b05510b66b452e9557b74396c2837dbc9721cbd
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 09:52:56 2019 +0800
添加populte地址
commit 104abc02193815fb481d2ae2dc6c0b3804a8c606
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 18:40:10 2019 +0800
添加部分select 完成地址的populdate
commit eac3f0ec2296d15d7608a6d2f9b771dedf1787ca
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:34:03 2019 +0800
删除Order_approval数据定义，所有的资金方审核订单数据保存在Pushed_order定义中。
commit 4a74e5b69b75212628396037802040f2f5792b29
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:17:10 2019 +0800
第三方系统集成封装代码。以及易泰链的封装部分实现。抽象部分为草稿，需要根据更多的资金方和核心企业系统情况完善。
commit 772a312906c353984b26e00c10a9b6081bc34d6f
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:15:09 2019 +0800
重构pushed_order数据定义，approvaler改为pusher，代表推送人。
commit 44470dcfb622303fdb7f6b30393fac0cbced5f88
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:14:05 2019 +0800
:
commit 8911f879fcef3fd13194450682d6af4f59f5edc5 (HEAD -> dev)
Merge: 34c5640 8769756
Author: aocn <willion@sohu.com>
Date: Tue Feb 26 11:05:49 2019 +0800
Merge branch 'dev' of gitlab.com:51/backend into dev
commit 8769756dd67380d9a9c3aa0248a7ac90e53f7a24 (origin/dev, origin/HEAD)
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 10:26:48 2019 +0800
添加缺少字段status
commit 3b05510b66b452e9557b74396c2837dbc9721cbd
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 09:52:56 2019 +0800
添加populte地址
commit 104abc02193815fb481d2ae2dc6c0b3804a8c606
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 18:40:10 2019 +0800
添加部分select 完成地址的populdate
commit eac3f0ec2296d15d7608a6d2f9b771dedf1787ca
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:34:03 2019 +0800
删除Order_approval数据定义，所有的资金方审核订单数据保存在Pushed_order定义中。
commit 4a74e5b69b75212628396037802040f2f5792b29
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:17:10 2019 +0800
第三方系统集成封装代码。以及易泰链的封装部分实现。抽象部分为草稿，需要根据更多的资金方和核心企业系统情况完善。
commit 772a312906c353984b26e00c10a9b6081bc34d6f
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:15:09 2019 +0800
重构pushed_order数据定义，approvaler改为pusher，代表推送人。
commit 44470dcfb622303fdb7f6b30393fac0cbced5f88
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:14:05 2019 +0800
添加管理员代表核心企业操作的权限定义。
commit 571f4bf43a706852ef2f1f5e258b819e513dd467
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 17:26:56 2019 +0800
添加地址populate
commit 325bfb044e6539301f7fc1cb137985e63cab257c
Author: Zhiquan <xzq@gvrcraft.com>
:
commit 8911f879fcef3fd13194450682d6af4f59f5edc5 (HEAD -> dev)
Merge: 34c5640 8769756
Author: aocn <willion@sohu.com>
Date: Tue Feb 26 11:05:49 2019 +0800
Merge branch 'dev' of gitlab.com:51/backend into dev
commit 8769756dd67380d9a9c3aa0248a7ac90e53f7a24 (origin/dev, origin/HEAD)
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 10:26:48 2019 +0800
添加缺少字段status
commit 3b05510b66b452e9557b74396c2837dbc9721cbd
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 09:52:56 2019 +0800
添加populte地址
commit 104abc02193815fb481d2ae2dc6c0b3804a8c606
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 18:40:10 2019 +0800
添加部分select 完成地址的populdate
commit eac3f0ec2296d15d7608a6d2f9b771dedf1787ca
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:34:03 2019 +0800
删除Order_approval数据定义，所有的资金方审核订单数据保存在Pushed_order定义中。
commit 4a74e5b69b75212628396037802040f2f5792b29
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:17:10 2019 +0800
第三方系统集成封装代码。以及易泰链的封装部分实现。抽象部分为草稿，需要根据更多的资金方和核心企业系统情况完善。
commit 772a312906c353984b26e00c10a9b6081bc34d6f
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:15:09 2019 +0800
重构pushed_order数据定义，approvaler改为pusher，代表推送人。
commit 44470dcfb622303fdb7f6b30393fac0cbced5f88
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:14:05 2019 +0800
添加管理员代表核心企业操作的权限定义。
commit 571f4bf43a706852ef2f1f5e258b819e513dd467
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 17:26:56 2019 +0800
添加地址populate
commit 325bfb044e6539301f7fc1cb137985e63cab257c
Author: Zhiquan <xzq@gvrcraft.com>
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git clean -df
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git checkout -- .
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git pull
Already up to date.
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 9 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git log
commit 8911f879fcef3fd13194450682d6af4f59f5edc5 (HEAD -> dev)
Merge: 34c5640 8769756
Author: aocn <willion@sohu.com>
Date: Tue Feb 26 11:05:49 2019 +0800
Merge branch 'dev' of gitlab.com:51/backend into dev
commit 8769756dd67380d9a9c3aa0248a7ac90e53f7a24 (origin/dev, origin/HEAD)
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 10:26:48 2019 +0800
添加缺少字段status
commit 3b05510b66b452e9557b74396c2837dbc9721cbd
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 09:52:56 2019 +0800
添加populte地址
commit 104abc02193815fb481d2ae2dc6c0b3804a8c606
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 18:40:10 2019 +0800
添加部分select 完成地址的populdate
commit eac3f0ec2296d15d7608a6d2f9b771dedf1787ca
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:34:03 2019 +0800
删除Order_approval数据定义，所有的资金方审核订单数据保存在Pushed_order定义中。
commit 4a74e5b69b75212628396037802040f2f5792b29
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:17:10 2019 +0800
第三方系统集成封装代码。以及易泰链的封装部分实现。抽象部分为草稿，需要根据更多的资金方和核心企业系统情况完善。
commit 772a312906c353984b26e00c10a9b6081bc34d6f
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:15:09 2019 +0800
重构pushed_order数据定义，approvaler改为pusher，代表推送人。
commit 44470dcfb622303fdb7f6b30393fac0cbced5f88
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:14:05 2019 +0800
添加管理员代表核心企业操作的权限定义。
commit 571f4bf43a706852ef2f1f5e258b819e513dd467
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 17:26:56 2019 +0800
添加地址populate
commit 325bfb044e6539301f7fc1cb137985e63cab257c
Author: Zhiquan <xzq@gvrcraft.com>
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git reset --hard 8769756dd67380d9
a9c3aa0248a7ac90e53f7a24
HEAD is now at 8769756 添加缺少字段status
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is up to date with 'origin/dev'.
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git log
commit 8769756dd67380d9a9c3aa0248a7ac90e53f7a24 (HEAD -> dev, origin/dev, origin/HEAD)
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 10:26:48 2019 +0800
添加缺少字段status
commit 3b05510b66b452e9557b74396c2837dbc9721cbd
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 09:52:56 2019 +0800
添加populte地址
commit 104abc02193815fb481d2ae2dc6c0b3804a8c606
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 18:40:10 2019 +0800
添加部分select 完成地址的populdate
commit eac3f0ec2296d15d7608a6d2f9b771dedf1787ca
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:34:03 2019 +0800
删除Order_approval数据定义，所有的资金方审核订单数据保存在Pushed_order定义中。
commit 4a74e5b69b75212628396037802040f2f5792b29
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:17:10 2019 +0800
第三方系统集成封装代码。以及易泰链的封装部分实现。抽象部分为草稿，需要根据更多的资金方和核心企业系统情况完善。
commit 772a312906c353984b26e00c10a9b6081bc34d6f
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:15:09 2019 +0800
重构pushed_order数据定义，approvaler改为pusher，代表推送人。
commit 44470dcfb622303fdb7f6b30393fac0cbced5f88
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:14:05 2019 +0800
添加管理员代表核心企业操作的权限定义。
commit 571f4bf43a706852ef2f1f5e258b819e513dd467
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 17:26:56 2019 +0800
添加地址populate
commit 325bfb044e6539301f7fc1cb137985e63cab257c
Author: Zhiquan <xzq@gvrcraft.com>
Date: Sun Feb 24 19:33:59 2019 +0800
第三方系统集成身份认证过程修复。
commit 46cc16d032a748967a9be68a2833a925c402e532
Author: aocn <willion@sohu.com>
Date: Sun Feb 24 19:27:31 2019 +0800
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git pull
Already up to date.
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git log
commit 8769756dd67380d9a9c3aa0248a7ac90e53f7a24 (HEAD -> dev, origin/dev, origin/HEAD)
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 10:26:48 2019 +0800
添加缺少字段status
commit 3b05510b66b452e9557b74396c2837dbc9721cbd
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Tue Feb 26 09:52:56 2019 +0800
添加populte地址
commit 104abc02193815fb481d2ae2dc6c0b3804a8c606
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 18:40:10 2019 +0800
添加部分select 完成地址的populdate
commit eac3f0ec2296d15d7608a6d2f9b771dedf1787ca
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:34:03 2019 +0800
删除Order_approval数据定义，所有的资金方审核订单数据保存在Pushed_order定义中。
commit 4a74e5b69b75212628396037802040f2f5792b29
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:17:10 2019 +0800
第三方系统集成封装代码。以及易泰链的封装部分实现。抽象部分为草稿，需要根据更多的资金方和核心企业系统情况完善。
commit 772a312906c353984b26e00c10a9b6081bc34d6f
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:15:09 2019 +0800
重构pushed_order数据定义，approvaler改为pusher，代表推送人。
commit 44470dcfb622303fdb7f6b30393fac0cbced5f88
Author: Zhiquan <xzq@gvrcraft.com>
Date: Mon Feb 25 18:14:05 2019 +0800
添加管理员代表核心企业操作的权限定义。
commit 571f4bf43a706852ef2f1f5e258b819e513dd467
Author: dtylove <3329944-dtylove@users.noreply.gitlab.com>
Date: Mon Feb 25 17:26:56 2019 +0800
添加地址populate
commit 325bfb044e6539301f7fc1cb137985e63cab257c
Author: Zhiquan <xzq@gvrcraft.com>
Date: Sun Feb 24 19:33:59 2019 +0800
第三方系统集成身份认证过程修复。
commit 46cc16d032a748967a9be68a2833a925c402e532
Author: aocn <willion@sohu.com>
Date: Sun Feb 24 19:27:31 2019 +0800
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is up to date with 'origin/dev'.
nothing to commit, working tree clean
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$
aocn@DESKTOP-D3M4BN9 MINGW64 /f/COMPANY/backend (dev)
$ git status
On branch dev
Your branch is up to date with 'origin/dev'.
nothing to commit, working tree clean
----------------------------------------------------
??? Today
git clean -df
git checkout -- .
git pull
git log
----------------------------------------------------
?????
git强制覆盖：
git fetch --all
git reset --hard origin/master
git pull
git强制覆盖本地命令（单条执行）：
git fetch --all && git reset --hard origin/master && git pull
浙公网安备 33010602011771号