shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2025-01-08 16:27:45 +08:00
Code Issues Projects Releases Packages Wiki Activity
472 commits 6 branches 0 tags 77 MiB
Commit graph

472 commits

This branch
This branch
All branches
Author SHA1 Message Date
shawn
4875e8140d Merge branch 'master' of github.com:shawncai/ERP 2019-11-14 19:14:51 +08:00
shawn
6da6a3d77a 聊天完成 2019-11-14 19:14:29 +08:00
beyond
c1c95647dc 中英文修改 2019-11-13 17:23:06 +08:00
beyond
dd4e81cccf Merge branch 'master' of github.com:shawncai/ERP 2019-11-12 16:35:47 +08:00
beyond
6aba7b715c 修改 2019-11-12 16:33:58 +08:00
shawn
afc8f63911 大小写匹配 
大小写匹配
 2019-11-12 16:33:14 +08:00
shawn
080ddc6a87 提交 
提交
 2019-11-12 15:28:20 +08:00
shawn
dbb8ef873c Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-12 15:25:42 +08:00
beyond
27cadcda75 Merge branch 'master' of github.com:shawncai/ERP 2019-11-12 15:18:22 +08:00
beyond
12ef751731 提交合并 
提交合并
 2019-11-12 15:18:11 +08:00
shawn
adb8a430ee 权限问题 
权限问题
 2019-11-12 15:16:52 +08:00
shawn
cd5e2720ce Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-12 15:08:10 +08:00
shawn
4951071a1f 车辆地图加载完成 
车辆地图加载完成
 2019-11-12 15:08:00 +08:00
beyond
2147590ff7 Merge branch 'master' of github.com:shawncai/ERP 2019-11-11 14:28:49 +08:00
beyond
11fe541092 uodate 2019-11-11 14:27:58 +08:00
beyond
47ceb51132 uodate 2019-11-11 14:26:21 +08:00
tczjx58520
ab6b7ea96c Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-11 14:22:49 +08:00
tczjx58520
15e85ff17d 中英文修改 2019-11-11 14:17:12 +08:00
tczjx58520
23a79a1850 修改 2019-11-11 14:16:26 +08:00
shawn
8d9fb9559e 车辆地图 
车辆地图
 2019-11-11 11:26:59 +08:00
beyond
f2c59803ac Merge branch 'master' of github.com:shawncai/ERP 2019-11-08 09:44:03 +08:00
beyond
6e13c39a0a 汇率修改 2019-11-08 09:43:47 +08:00
tczjx58520
05c0b5fce9 Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-07 20:37:57 +08:00
tczjx58520
72030e3d74 11.7 
修改搜索
 2019-11-07 20:37:15 +08:00
shawn
8b93ecface Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-07 20:36:57 +08:00
shawn
8203db8aa2 冲突 
冲突
 2019-11-07 20:36:35 +08:00
tczjx58520
1d41025b88 Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-07 17:27:47 +08:00
tczjx58520
45ef9b7610 11.7 
修改查询bug
 2019-11-07 17:27:27 +08:00
shawn
c57f0fb0de Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-07 16:46:39 +08:00
shawn
bb29fe2b1c 1/3修改备份 
1/3修改备份
 2019-11-07 16:46:20 +08:00
tczjx58520
19766eb9ee 修改bug 
11.7
 2019-11-07 16:29:03 +08:00
tczjx58520
20dfed4370 Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-06 13:29:41 +08:00
tczjx58520
334001544e 11.6 
修改bug
 2019-11-06 13:29:05 +08:00
beyond
d23c0d2d9c Merge branch 'master' of github.com:shawncai/ERP 2019-11-06 09:36:08 +08:00
beyond
2b5b888374 区域权限完成 2019-11-06 09:29:30 +08:00
tczjx58520
81754d6e7f Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-05 21:00:26 +08:00
tczjx58520
3c61dea4fd 11.5 
修改bug
 2019-11-05 21:00:02 +08:00
beyond
2e7989046e Merge branch 'master' of github.com:shawncai/ERP 2019-11-05 16:19:46 +08:00
beyond
829db117db 提交 2019-11-05 16:19:28 +08:00
tczjx58520
9b051c9639 修改bug 
11.5
 2019-11-05 16:18:43 +08:00
tczjx58520
1dbf33b8d1 Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-05 15:05:06 +08:00
tczjx58520
925481a30c 修改bug 
11.5
 2019-11-05 15:04:48 +08:00
beyond
4426a29ef9 Merge branch 'master' of github.com:shawncai/ERP 2019-11-05 14:22:39 +08:00
beyond
b386835949 ttt 2019-11-05 14:22:18 +08:00
tczjx58520
da8662af9f 修改bug 
11.5
 2019-11-05 14:22:16 +08:00
tczjx58520
ebd788a3db 11.5 
修改bug
 2019-11-05 14:17:29 +08:00
tczjx58520
6bec87b653 分页bug 2019-11-05 13:59:51 +08:00
tczjx58520
19cba41db6 Merge branch 'master' of https://github.com/shawncai/ERP 2019-11-05 13:56:47 +08:00
tczjx58520
52fe2a45b7 11.5 
修改bug
 2019-11-05 13:56:31 +08:00
beyond
d48cab2c10 Merge branch 'master' of github.com:shawncai/ERP 2019-11-05 13:29:36 +08:00