chenbo
|
02f1b63096
|
update
|
2023-10-24 14:26:19 +08:00 |
|
chenbo
|
f7dc74b3fc
|
add 商城商品列表
|
2023-10-24 13:43:35 +08:00 |
|
chenbo
|
d52a918109
|
add 商城列表
|
2023-10-24 11:23:20 +08:00 |
|
chenbo
|
6f1de215c1
|
add 村任务结算，分润,账户流水记录
|
2023-10-24 10:10:50 +08:00 |
|
chenbo
|
328aa375a9
|
fix 村公司任务6提交接口
add 村公司任务8提交接口，当天有临时任务的话，需要上传完成任务凭证，经后台审批通过后才发放
|
2023-10-24 10:04:32 +08:00 |
|
chenbo
|
8a0e4a0b4b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-24 10:04:05 +08:00 |
|
chenbo
|
cda01503f7
|
fix 村公司任务6提交接口
add 村公司任务8提交接口，当天有临时任务的话，需要上传完成任务凭证，经后台审批通过后才发放
|
2023-10-24 10:03:49 +08:00 |
|
weiz
|
1f50fa8f4d
|
Merge pull request '新增农户土地信息接口' (#143) from zhangwei into dev
Reviewed-on: #143
|
2023-10-23 17:56:56 +08:00 |
|
weiz
|
49d68f4eee
|
新增农户土地信息接口
|
2023-10-23 17:55:25 +08:00 |
|
chenbo
|
c73d2a7422
|
add 任务8自动结算
|
2023-10-23 17:53:14 +08:00 |
|
chenbo
|
73f79b6036
|
add 村联络员任务下发，结算判定，分润.无法自动判定的任务的提交和审批以及结算。
|
2023-10-23 17:31:01 +08:00 |
|
chenbo
|
3f164288ac
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-23 14:21:34 +08:00 |
|
chenbo
|
d9bcd0fa27
|
update 村管理公司任务-信息平台铺设提交接口
|
2023-10-23 14:18:05 +08:00 |
|
weiz
|
d51e8bc895
|
Merge pull request '修改溯源系统请求供销系统农户信息的请求方式' (#142) from zhangwei into dev
Reviewed-on: #142
|
2023-10-23 09:33:12 +08:00 |
|
weiz
|
f6a207cb61
|
修改溯源系统请求供销系统农户信息的请求方式
|
2023-10-23 09:32:15 +08:00 |
|
weiz
|
538ca07f4b
|
Merge pull request '新增溯源系统调用的获取农户信息接口' (#141) from zhangwei into dev
Reviewed-on: #141
|
2023-10-21 17:59:56 +08:00 |
|
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 |
|