weiz
|
332c7ed494
|
新增溯源系统调用的获取农户信息接口
|
2023-10-21 17:58:56 +08:00 |
|
weiz
|
92b4c1355a
|
Merge pull request 'fixed' (#140) from zhangwei into dev
Reviewed-on: #140
|
2023-10-21 14:12:25 +08:00 |
|
weiz
|
5c4a77fc9c
|
fixed
|
2023-10-21 14:11:55 +08:00 |
|
weiz
|
cdf2c3eed7
|
Merge pull request 'fixed' (#139) from zhangwei into dev
Reviewed-on: #139
|
2023-10-21 14:10:14 +08:00 |
|
weiz
|
ea0ddac967
|
fixed
|
2023-10-21 14:09:42 +08:00 |
|
weiz
|
17818c0a84
|
Merge pull request 'fixed' (#138) from zhangwei into dev
Reviewed-on: #138
|
2023-10-21 13:56:29 +08:00 |
|
weiz
|
e1d6aced4c
|
fixed
|
2023-10-21 13:56:01 +08:00 |
|
weiz
|
45e2ac2e14
|
Merge pull request 'fixed' (#137) from zhangwei into dev
Reviewed-on: #137
|
2023-10-21 13:51:43 +08:00 |
|
weiz
|
3c79f88de1
|
fixed
|
2023-10-21 13:51:09 +08:00 |
|
weiz
|
9f92573c8d
|
Merge pull request 'fixed' (#136) from zhangwei into dev
Reviewed-on: #136
|
2023-10-21 11:57:57 +08:00 |
|
weiz
|
0eb6d8607d
|
fixed
|
2023-10-21 11:56:43 +08:00 |
|
yaooo
|
374d8ea6f6
|
Merge remote-tracking branch 'origin/dev' into preview
|
2023-10-21 11:40:54 +08:00 |
|
chenbo
|
00f49b08f0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-21 11:39:51 +08:00 |
|
chenbo
|
96ce4310e4
|
update 小组团第任务-其他任务可重复创建
|
2023-10-21 11:39:39 +08:00 |
|
weiz
|
eba3732a72
|
Merge pull request 'admin pages update' (#135) from zhangwei into dev
Reviewed-on: #135
|
2023-10-21 11:38:35 +08:00 |
|
weiz
|
f9b081d4d4
|
reset vendor worker ip
|
2023-10-21 11:36:52 +08:00 |
|
chenbo
|
6ee37ae389
|
update 梳理公司余额，股金，押金三类金额的流水记录。
|
2023-10-21 10:40:41 +08:00 |
|
chenbo
|
8da2085806
|
update 梳理公司余额，股金，押金三类金额的流水记录。
|
2023-10-21 10:37:57 +08:00 |
|
chenbo
|
4a0b9cfbae
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# public/admin/index.html
|
2023-10-21 10:19:15 +08:00 |
|
chenbo
|
ff602c7d6b
|
Merge remote-tracking branch 'origin/master-yajin-feature' into dev
# Conflicts:
# public/admin/index.html
|
2023-10-21 10:18:51 +08:00 |
|
weiz
|
50a9195cdd
|
admin pages update
|
2023-10-21 10:13:43 +08:00 |
|
yaooo
|
98dd3970e7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev
|
2023-10-21 09:32:18 +08:00 |
|
chenbo
|
c98f561022
|
add 前端代码更新
|
2023-10-21 09:30:07 +08:00 |
|
yaooo
|
d2fa4826cc
|
更新ocr
|
2023-10-21 09:28:35 +08:00 |
|
zmj
|
6a2853b6a4
|
im测试环境
|
2023-10-20 22:57:58 +08:00 |
|
zmj
|
c148c5fcc7
|
pc测试更新
|
2023-10-20 22:23:55 +08:00 |
|
weiz
|
36e902a2af
|
update admin pages
|
2023-10-20 20:20:36 +08:00 |
|
weiz
|
45419c7c35
|
test
|
2023-10-20 20:18:21 +08:00 |
|
shengchanzhe
|
edfdcd96ab
|
更新pc
|
2023-10-20 19:07:23 +08:00 |
|
shengchanzhe
|
9a47e8e728
|
更新前端
|
2023-10-20 18:43:59 +08:00 |
|
weiz
|
7d73fe7d8b
|
update admin pages
|
2023-10-20 18:09:09 +08:00 |
|
chenbo
|
c731fa3976
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-20 17:48:16 +08:00 |
|
chenbo
|
4ca0700e96
|
fixed：任务审批列表
|
2023-10-20 17:48:05 +08:00 |
|
weiz
|
2183507283
|
Merge pull request 'fixed workerman ip' (#134) from zhangwei into dev
Reviewed-on: #134
|
2023-10-20 17:47:55 +08:00 |
|
weiz
|
0f2c0e0982
|
fixed workerman ip
|
2023-10-20 17:47:22 +08:00 |
|
weiz
|
83ccb3ae92
|
Merge pull request 'fixed register ip' (#133) from zhangwei into dev
Reviewed-on: #133
|
2023-10-20 17:42:18 +08:00 |
|
weiz
|
9d24f39dfa
|
fixed register ip
|
2023-10-20 17:41:55 +08:00 |
|
weiz
|
406a8555e0
|
Merge pull request 'fixed register ip' (#132) from zhangwei into dev
Reviewed-on: #132
|
2023-10-20 17:34:58 +08:00 |
|
weiz
|
6144dea271
|
fixed register ip
|
2023-10-20 17:34:34 +08:00 |
|
weiz
|
a652dd2a54
|
Merge pull request 'fixed register ip' (#131) from zhangwei into dev
Reviewed-on: #131
|
2023-10-20 17:29:17 +08:00 |
|
weiz
|
e66e0d1a68
|
fixed register ip
|
2023-10-20 17:28:41 +08:00 |
|
yaooo
|
1bc49b39fa
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev
|
2023-10-20 17:23:21 +08:00 |
|
yaooo
|
d89974dd51
|
更新question
|
2023-10-20 17:23:13 +08:00 |
|
weiz
|
89606dc0a3
|
Merge pull request 'fixed' (#130) from zhangwei into dev
Reviewed-on: #130
|
2023-10-20 17:22:23 +08:00 |
|
weiz
|
d79fabc563
|
fixed
|
2023-10-20 17:21:57 +08:00 |
|
weiz
|
c117168eb5
|
Merge pull request 'fixed' (#129) from zhangwei into dev
Reviewed-on: #129
|
2023-10-20 17:12:17 +08:00 |
|
weiz
|
790d357c49
|
fixed
|
2023-10-20 17:11:47 +08:00 |
|
weiz
|
52f386c61b
|
Merge pull request 'fixed' (#128) from zhangwei into dev
Reviewed-on: #128
|
2023-10-20 16:41:46 +08:00 |
|
weiz
|
121de0459d
|
fixed
|
2023-10-20 16:41:08 +08:00 |
|
chenbo
|
814f7f2821
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-20 16:38:30 +08:00 |
|