eason
|
3d01808106
|
fix
|
6 years ago |
eason
|
3ab85dd480
|
fix
|
6 years ago |
yuan
|
62ad8b34f0
|
Merge branch 'develop' into local_HF
|
6 years ago |
yuan
|
3b399f69c6
|
fix html bug
|
6 years ago |
yuan
|
66ba4c7074
|
add getaway 14
|
6 years ago |
yuan
|
0be969f168
|
fix bug
|
6 years ago |
yuan
|
cbb7ac69a4
|
add getaway 14
|
6 years ago |
eason
|
bf70ee21e5
|
fix
|
6 years ago |
eason
|
9e4e4b85a5
|
fix
|
6 years ago |
eason
|
d7735f8786
|
Merge branch 'develop'
|
6 years ago |
yuan
|
b5695df77b
|
fix html
|
6 years ago |
yuan
|
d5c04c61b3
|
add apply handle
|
6 years ago |
yuan
|
0df950683d
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yuan
|
b164e32641
|
fix
|
6 years ago |
yuan
|
f83270be4c
|
add enable_link
|
6 years ago |
wangning
|
710661dca3
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
wangning
|
fc744e9f0c
|
add hf
|
6 years ago |
eason
|
9c5e11b7eb
|
fix
|
6 years ago |
eason
|
b80cc8d191
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
eason
|
4b79f3fe60
|
fix
|
6 years ago |
wangning
|
42b242b8de
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
wangning
|
9ddfe7ef1f
|
add hf
|
6 years ago |
eason
|
48d2d7b58e
|
fix app settlement log
|
6 years ago |
yuan
|
2f7c05f474
|
Merge branch 'develop' into local_HF
# Conflicts:
# src/db/modify.sql
|
6 years ago |
yuan
|
6ca6628c12
|
fix apply
|
6 years ago |
yuan
|
7b4f2241c9
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
eason
|
c2ef822d7d
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
eason
|
d48d4393d1
|
short url
|
6 years ago |
yuan
|
82a00fe302
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yixian
|
f226209c9a
|
settle mail fix
|
6 years ago |
yixian
|
c30b9f0d72
|
ui update
|
6 years ago |
yixian
|
a779b081a6
|
ui update
|
6 years ago |
wangning
|
48dc28ae5e
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
6 years ago |
wangning
|
7b65dacb00
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
wangning
|
60f5594796
|
remove transaction
|
6 years ago |
eason
|
b486b6b5b6
|
Merge branch 'develop'
|
6 years ago |
yixian
|
98ae44a567
|
fix ui bug
|
6 years ago |
yixian
|
76600c5dfd
|
fix ui bug
|
6 years ago |
yixian
|
ca67b30db2
|
fix ui bug
|
6 years ago |
yixian
|
2d18aea16b
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yixian
|
c4622ada47
|
fix ui bug
|
6 years ago |
eason
|
b5156708f0
|
fix 清算记录未完成区别显示逻辑
|
6 years ago |
yuan
|
4cc03be2dc
|
Merge branch 'invoice_fix' into develop
|
6 years ago |
yuan
|
f4899470bd
|
fix bug
|
6 years ago |
yixian
|
8e78d70a7e
|
Round Half Down edit to prevent deprecated warnings
|
6 years ago |
yixian
|
af2e674a2b
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yixian
|
0d48030501
|
distribute bank ui
|
6 years ago |
yuan
|
c8262648f0
|
Merge branch 'invoice_fix' into develop
|
6 years ago |
yuan
|
4fa475fbb1
|
fix invoice bug
|
6 years ago |
yixian
|
a4bfebe22a
|
settle log view edit
|
6 years ago |