TaskSystem

mkm/TaskSystem

Fork 0

Commit Graph

Select branches

Hide Pull Requests

chenbo_dev

dev

dev_1201_newpay

dev_task

dev_towntask

feature

master

master-yajin-feature

master_旧

mkm

mkm-2

preview

zhangwei

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

8ac05f8fa3 update zhangwei weiz 2023-11-25 14:33:41 +08:00
995ede0dff update 更新前端代码 chenbo 2023-11-25 10:20:13 +08:00
f8bda77d0c Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-25 10:12:36 +08:00
7bd126f091 fixed chenbo 2023-11-25 10:10:17 +08:00
d802ff0c75 更新小组角色 yaooo 2023-11-24 14:19:26 +08:00
93adb3d543 更新供销系统登录 yaooo 2023-11-24 14:06:14 +08:00
55aa3159ee Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-24 14:00:44 +08:00
ad80574645 更新供销系统登录 yaooo 2023-11-24 14:00:36 +08:00
13ae414917 fixed 后台在任务运行中删除了任务模板，导致结算出现异常 chenbo 2023-11-24 13:46:20 +08:00
0c54ba8c34 fixed 后台在任务运行中删除了任务模板，导致结算出现异常 chenbo 2023-11-24 11:58:58 +08:00
0e7c4434ff 更新解析token yaooo 2023-11-24 10:56:19 +08:00
d85687169d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-24 10:53:50 +08:00
134765255d 更新解析token yaooo 2023-11-24 10:53:34 +08:00
a3cdb43f1c update 镇农科公司任务改为镇合伙人公司任务 chenbo 2023-11-24 10:37:22 +08:00
6f9ef8c79f Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-24 10:33:23 +08:00
f327cfa298 update 镇农科公司任务改为镇合伙人公司任务 chenbo 2023-11-24 10:33:11 +08:00
9d422a2d45 新增解析中台系统token yaooo 2023-11-24 10:23:08 +08:00
1ff270db8b Merge remote-tracking branch 'origin/preview' mkm 2023-11-22 17:35:58 +08:00
3f791f3134 update 手动下发任务相关接口 chenbo 2023-11-22 15:03:18 +08:00
759a9d4eb5 Merge branch 'dev' into preview chenbo 2023-11-22 14:05:26 +08:00
6926465e04 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-22 14:04:47 +08:00
8357942b41 update 手动下发任务相关接口 chenbo 2023-11-22 14:04:30 +08:00
e419d84b60 Merge pull request '前台登录接口增加一体机极光推送设备id参数' (#173) from zhangwei into dev weiz 2023-11-22 11:03:42 +08:00
5993ecef3c 前台登录接口增加一体机极光推送设备id参数 weiz 2023-11-22 11:01:36 +08:00
d09758fa98 add 对接支付系统，回调改造 chenbo 2023-11-21 11:15:40 +08:00
6c44af1cf0 add 对接支付系统，回调改造 chenbo 2023-11-21 10:43:26 +08:00
78b7c8ea0a add 对接支付系统，回调改造 chenbo 2023-11-21 10:40:34 +08:00
cdde963325 fixed chenbo 2023-11-21 09:09:10 +08:00
3d249a63ae fixed chenbo 2023-11-20 19:01:21 +08:00
959f7d642f fixed chenbo 2023-11-20 18:23:58 +08:00
a9b29f03e8 fixed chenbo 2023-11-20 18:04:03 +08:00
c9d14e48cb fixed chenbo 2023-11-20 17:51:18 +08:00
92f2abfc11 fixed chenbo 2023-11-20 17:27:40 +08:00
d7a76319af fixed chenbo 2023-11-20 17:10:46 +08:00
20d01ac6d9 fixed chenbo 2023-11-20 14:40:46 +08:00
4daa667d6c up 供销对接支付系统 chenbo 2023-11-20 14:21:07 +08:00
35f6dcf591 up 供销对接支付系统 chenbo 2023-11-20 13:51:40 +08:00
cc999b400f up 供销对接支付系统 chenbo 2023-11-20 12:06:19 +08:00
a2d65de03e fixed chenbo 2023-11-20 11:01:39 +08:00
98103e40dd fixed chenbo 2023-11-20 10:58:44 +08:00
6d08fba3a2 fixed chenbo 2023-11-20 10:51:09 +08:00
0c9cb2a0d7 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-20 10:48:55 +08:00
04d478d880 add 供销对接支付系统 chenbo 2023-11-20 10:48:44 +08:00
cd40872bc2 Merge pull request '新增公司成员对外接口' (#172) from zhangwei into dev weiz 2023-11-20 10:41:41 +08:00
4582e4b30f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-20 10:36:55 +08:00
b78ec65632 更新细节 yaooo 2023-11-20 10:36:35 +08:00
b4c6f00ffe fixed chenbo 2023-11-20 10:09:34 +08:00
75585f8e5f 新增公司成员对外接口 weiz 2023-11-20 09:42:49 +08:00
e05552b206 fixed 负责人任务 chenbo 2023-11-18 20:16:44 +08:00
843f41c7cf fixed 协助总负责人 chenbo 2023-11-18 19:29:13 +08:00
75d34b1a84 fixed 应用软件推广 chenbo 2023-11-18 18:25:17 +08:00
2c26571b2e fixed 应用软件推广 chenbo 2023-11-18 17:33:09 +08:00
f9aa235b66 Merge branch 'dev' into preview chenbo 2023-11-18 10:08:26 +08:00
0552ae8ebd 入股审核 chenbo 2023-11-18 09:52:43 +08:00
0240331c6f update 更新前端代码 chenbo 2023-11-18 09:33:10 +08:00
a9cd078339 入股审核 chenbo 2023-11-17 19:14:10 +08:00
2515fcc436 Merge pull request 'preview' (#171) from preview into master mkm 2023-11-17 19:05:23 +08:00
b98bbefcfc Merge pull request 'dev' (#170) from dev into preview mkm 2023-11-17 19:05:07 +08:00
dbcffd626a Merge pull request 'preview' (#169) from preview into master mkm 2023-11-17 19:04:39 +08:00
50ee9c7282 入股审核类型列表接口 chenbo 2023-11-17 18:47:14 +08:00
8860d5eefe Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-17 17:46:57 +08:00
70f3e6d83e 入股审核类型列表接口 chenbo 2023-11-17 17:46:49 +08:00
b4afce7c10 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-17 17:20:57 +08:00
190128c91b 更新兼容性 yaooo 2023-11-17 17:20:41 +08:00
edfeccf5df Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-17 17:18:49 +08:00
ef8e453162 update app用户信息接口增加用户group_id，任务列表新增任务类型code码 chenbo 2023-11-17 17:18:39 +08:00
35de09d273 更新兼容性 yaooo 2023-11-17 16:39:49 +08:00
4e48919944 更新公司列表chax yaooo 2023-11-17 16:19:46 +08:00
0689f844d9 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-17 14:20:49 +08:00
cae380f93e 新增获取甲方公司信息 yaooo 2023-11-17 14:20:29 +08:00
746b9dcb37 fixed chenbo 2023-11-17 13:53:31 +08:00
96e2673ad3 fixed chenbo 2023-11-17 13:51:13 +08:00
d264bbbf33 Merge branch 'preview' of https://gitea.lihaink.cn/mkm/TaskSystem mkm 2023-11-17 12:05:03 +08:00
617d69d34c update 镇农科负责人-促成村联络员入股甲方任务改为手动审核，线下转账 chenbo 2023-11-17 12:03:25 +08:00
43dc941e10 update 更新前端代码 chenbo 2023-11-17 12:02:11 +08:00
d6f6b70a0e Merge branch 'preview' of https://gitea.lihaink.cn/mkm/TaskSystem mkm 2023-11-17 11:54:10 +08:00
29ed839407 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-17 10:54:50 +08:00
4e52bcce2a update 村联络员-督促小组服务团队入股任,镇农科服务部长-督促小组服务团队入股村管理公司任务,村联络员任务-入股甲方公司.改为手动审核，线下转账 chenbo 2023-11-17 10:53:26 +08:00
1e97e3f536 update 村联络员-督促小组服务团队入股任,镇农科服务部长-督促小组服务团队入股村管理公司任务,村联络员任务-入股甲方公司.改为手动审核，线下转账 chenbo 2023-11-17 10:52:12 +08:00
a822dc5eae update 更新前端代码 chenbo 2023-11-17 10:41:23 +08:00
1c8fd0153c update 小组服务团队任务-入股任务改为手动审核，线下转账 chenbo 2023-11-16 17:56:21 +08:00
36a04096b1 update 小组服务团队任务-入股任务改为手动审核，线下转账 chenbo 2023-11-16 17:23:29 +08:00
4617aea97e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-16 16:17:46 +08:00
95ef57c67a 更新图片上传 yaooo 2023-11-16 16:17:31 +08:00
819802b389 update 市级供应链商户固定由泸州市海之农科技有限公司审批 chenbo 2023-11-16 15:46:24 +08:00
0d8e60d862 Merge pull request 'update' (#167) from zhangwei into dev weiz 2023-11-16 15:19:31 +08:00
fa1923bb1e update weiz 2023-11-16 15:17:46 +08:00
f4daf29d0c Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-16 13:54:27 +08:00
089a449f3a 上传押金凭证 yaooo 2023-11-16 13:54:06 +08:00
a3dd939548 Merge branch 'dev' into preview chenbo 2023-11-16 11:47:53 +08:00
fad8725593 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-16 11:46:31 +08:00
c8675a6bd1 update 市级供应链商户固定由泸州市海之农科技有限公司审批 chenbo 2023-11-16 11:46:21 +08:00
531531a3e5 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-16 11:34:17 +08:00
b193499086 获取押金凭证 yaooo 2023-11-16 11:33:55 +08:00
91bc6676ce update 市级供应链商户固定由泸州市海之农科技有限公司审批 chenbo 2023-11-16 11:23:34 +08:00
d280ac6248 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-16 11:08:20 +08:00
d6d0625943 update 市级供应链商户固定由泸州市海之农科技有限公司审批 chenbo 2023-11-16 11:08:10 +08:00
a84d83fa14 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-16 11:03:05 +08:00
7b0f5a2c87 更新负责人接口 yaooo 2023-11-16 11:02:48 +08:00
cf05fd0060 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-16 10:36:48 +08:00