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
|
49d68f4eee
|
新增农户土地信息接口
|
2023-10-23 17:55:25 +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
|
f6a207cb61
|
修改溯源系统请求供销系统农户信息的请求方式
|
2023-10-23 09:32:15 +08:00 |
|
weiz
|
332c7ed494
|
新增溯源系统调用的获取农户信息接口
|
2023-10-21 17:58:56 +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 |
|
yaooo
|
98dd3970e7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev
|
2023-10-21 09:32:18 +08:00 |
|
yaooo
|
d2fa4826cc
|
更新ocr
|
2023-10-21 09:28:35 +08:00 |
|
weiz
|
45419c7c35
|
test
|
2023-10-20 20:18:21 +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 |
|
chenbo
|
5c1273ba4c
|
fixed：其他任务提交和审批
|
2023-10-20 16:38:16 +08:00 |
|
chenbo
|
85cc16a8cd
|
update：小组服务公司管理员可查看公司所有任务
|
2023-10-20 15:41:52 +08:00 |
|
chenbo
|
60defd526b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-20 10:47:03 +08:00 |
|
chenbo
|
18c7338903
|
update：任务审批联调-市场部长数字农贸宣传业务、加工业务的建设和招商工作
|
2023-10-20 10:46:50 +08:00 |
|
yaooo
|
a000ab203c
|
更新ocr识别接口
|
2023-10-19 18:16:11 +08:00 |
|
yaooo
|
9f1c440ab7
|
更新ocr识别接口
|
2023-10-19 18:08:14 +08:00 |
|
yaooo
|
d5c109e0a4
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev
|
2023-10-19 17:36:46 +08:00 |
|
yaooo
|
75c7cd4d6b
|
更新ocr识别接口
|
2023-10-19 17:36:22 +08:00 |
|
chenbo
|
9049b0784f
|
update：任务提交-市场部长数字农贸宣传业务、加工业务的建设和招商工作详情接口
|
2023-10-19 17:32:11 +08:00 |
|
chenbo
|
e44c0c202d
|
update：任务提交-市场部长数字农贸宣传业务、加工业务的建设和招商工作详情接口
|
2023-10-19 17:12:27 +08:00 |
|
chenbo
|
fb92e4106a
|
update：任务提交-市场部长数字农贸宣传业务、加工业务的建设和招商工作详情接口
|
2023-10-19 17:01:51 +08:00 |
|
chenbo
|
2fb707edad
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-19 16:03:13 +08:00 |
|
chenbo
|
b13b8eceef
|
add：任务审批-市场部长数字农贸宣传业务、加工业务的建设和招商工作
|
2023-10-19 16:03:01 +08:00 |
|
weiz
|
4339b0265e
|
update
|
2023-10-19 14:15:02 +08:00 |
|
weiz
|
cd407fe401
|
update
|
2023-10-19 11:57:38 +08:00 |
|
chenbo
|
8b56240eaa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-19 10:49:15 +08:00 |
|
chenbo
|
5b48be926e
|
add：存管理公司后台任务模板添加，任务下发
|
2023-10-19 10:49:03 +08:00 |
|
weiz
|
43802d4b23
|
购买车辆数量bug修复
|
2023-10-19 10:10:17 +08:00 |
|
chenbo
|
ad93d3f05c
|
fixed 任务提交
|
2023-10-19 09:47:37 +08:00 |
|
chenbo
|
170bf379ae
|
fixed 任务提交
|
2023-10-19 09:45:59 +08:00 |
|
chenbo
|
8fb9aeddbe
|
任务10 提交接口
|
2023-10-18 18:24:11 +08:00 |
|
chenbo
|
a85a59cbd9
|
任务10 提交接口
|
2023-10-18 18:20:49 +08:00 |
|
unknown
|
0ca38971e0
|
update
|
2023-10-18 18:09:41 +08:00 |
|
chenbo
|
3dba51a7b3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-18 18:01:56 +08:00 |
|
chenbo
|
f3467e9dd8
|
add:任务10提交接口，新增说明字段
|
2023-10-18 18:00:21 +08:00 |
|
weiz
|
951861c36e
|
Merge pull request 'update' (#119) from zhangwei into dev
Reviewed-on: #119
|
2023-10-18 17:19:02 +08:00 |
|
unknown
|
60c95e000e
|
update
|
2023-10-18 17:18:43 +08:00 |
|
weiz
|
9149c3d634
|
Merge pull request 'update' (#116) from zhangwei into dev
Reviewed-on: #116
|
2023-10-18 16:53:11 +08:00 |
|
unknown
|
16fc88fb9b
|
update
|
2023-10-18 16:52:41 +08:00 |
|
chenbo
|
f75900d0b8
|
add:任务10提交接口，新增说明字段
|
2023-10-18 16:30:33 +08:00 |
|
chenbo
|
7601aca958
|
add:任务10结算分润
|
2023-10-18 15:49:14 +08:00 |
|
unknown
|
6e90abe2b3
|
update
|
2023-10-18 15:18:21 +08:00 |
|
unknown
|
4ee45bdf08
|
update
|
2023-10-18 14:56:43 +08:00 |
|
unknown
|
00dc9c1c0a
|
update
|
2023-10-18 14:41:46 +08:00 |
|
unknown
|
32d0c15469
|
update
|
2023-10-18 14:03:43 +08:00 |
|
chenbo
|
b34eec7c68
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-18 11:17:13 +08:00 |
|