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

790d357c49 fixed weiz 2023-10-20 17:11:47 +08:00
52f386c61b Merge pull request 'fixed' (#128) from zhangwei into dev weiz 2023-10-20 16:41:46 +08:00
121de0459d fixed weiz 2023-10-20 16:41:08 +08:00
814f7f2821 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-20 16:38:30 +08:00
5c1273ba4c fixed：其他任务提交和审批 chenbo 2023-10-20 16:38:16 +08:00
1713b3f187 Merge pull request 'test' (#127) from zhangwei into dev weiz 2023-10-20 16:29:57 +08:00
775fabd126 test weiz 2023-10-20 16:29:26 +08:00
9b498de149 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-20 15:42:06 +08:00
85cc16a8cd update：小组服务公司管理员可查看公司所有任务 chenbo 2023-10-20 15:41:52 +08:00
8f3c7a2a45 Merge pull request 'im port change' (#126) from zhangwei into dev weiz 2023-10-20 14:11:34 +08:00
ee01071f92 im port change weiz 2023-10-20 14:08:07 +08:00
62f53f1e19 Merge pull request 'dev' (#125) from dev into preview chenbo 2023-10-20 13:59:25 +08:00
60defd526b Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-20 10:47:03 +08:00
18c7338903 update：任务审批联调-市场部长数字农贸宣传业务、加工业务的建设和招商工作 chenbo 2023-10-20 10:46:50 +08:00
a000ab203c 更新ocr识别接口 yaooo 2023-10-19 18:16:11 +08:00
9f1c440ab7 更新ocr识别接口 yaooo 2023-10-19 18:08:14 +08:00
d5c109e0a4 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-10-19 17:36:46 +08:00
75c7cd4d6b 更新ocr识别接口 yaooo 2023-10-19 17:36:22 +08:00
9049b0784f update：任务提交-市场部长数字农贸宣传业务、加工业务的建设和招商工作详情接口 chenbo 2023-10-19 17:32:11 +08:00
e44c0c202d update：任务提交-市场部长数字农贸宣传业务、加工业务的建设和招商工作详情接口 chenbo 2023-10-19 17:12:27 +08:00
fb92e4106a update：任务提交-市场部长数字农贸宣传业务、加工业务的建设和招商工作详情接口 chenbo 2023-10-19 17:01:51 +08:00
2fb707edad Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-19 16:03:13 +08:00
b13b8eceef add：任务审批-市场部长数字农贸宣传业务、加工业务的建设和招商工作 chenbo 2023-10-19 16:03:01 +08:00
e9434ace57 Merge pull request 'update' (#124) from zhangwei into dev weiz 2023-10-19 14:15:25 +08:00
4339b0265e update weiz 2023-10-19 14:15:02 +08:00
ffeb73f820 Merge pull request 'update' (#123) from zhangwei into dev weiz 2023-10-19 11:58:35 +08:00
cd407fe401 update weiz 2023-10-19 11:57:38 +08:00
07bf892d67 add：前端最新开发代码 chenbo 2023-10-19 11:04:30 +08:00
edd8d051f9 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-19 10:59:28 +08:00
bd248fc2cb add：任务审批-市场部长数字农贸宣传业务、加工业务的建设和招商工作 chenbo 2023-10-19 10:59:19 +08:00
5178b6079d Merge pull request '修复重新发送合同bug' (#122) from zhangwei into dev weiz 2023-10-19 10:53:56 +08:00
a537f98180 修复重新发送合同bug weiz 2023-10-19 10:53:03 +08:00
8b56240eaa Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-19 10:49:15 +08:00
5b48be926e add：存管理公司后台任务模板添加，任务下发 chenbo 2023-10-19 10:49:03 +08:00
beed5aef29 Merge pull request '购买车辆数量bug修复' (#121) from zhangwei into dev weiz 2023-10-19 10:10:51 +08:00
43802d4b23 购买车辆数量bug修复 weiz 2023-10-19 10:10:17 +08:00
ad93d3f05c fixed 任务提交 chenbo 2023-10-19 09:47:37 +08:00
170bf379ae fixed 任务提交 chenbo 2023-10-19 09:45:59 +08:00
8fb9aeddbe 任务10 提交接口 chenbo 2023-10-18 18:24:11 +08:00
a85a59cbd9 任务10 提交接口 chenbo 2023-10-18 18:20:49 +08:00
9dde757e8a Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-18 18:11:05 +08:00
a9b62cbdd6 fixed chenbo 2023-10-18 18:10:53 +08:00
c5f35f6532 Merge pull request 'update' (#120) from zhangwei into dev weiz 2023-10-18 18:10:06 +08:00
0ca38971e0 update unknown 2023-10-18 18:09:41 +08:00
3dba51a7b3 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-18 18:01:56 +08:00
f3467e9dd8 add:任务10提交接口，新增说明字段 chenbo 2023-10-18 18:00:21 +08:00
951861c36e Merge pull request 'update' (#119) from zhangwei into dev weiz 2023-10-18 17:19:02 +08:00
60c95e000e update unknown 2023-10-18 17:18:43 +08:00
074cad1ca4 Merge pull request 'update' (#118) from zhangwei into dev weiz 2023-10-18 17:03:44 +08:00
c8af6af007 update unknown 2023-10-18 17:03:26 +08:00
cbda2c026f Merge pull request 'update' (#117) from zhangwei into dev weiz 2023-10-18 17:01:04 +08:00
38690a5c9a update unknown 2023-10-18 17:00:44 +08:00
9149c3d634 Merge pull request 'update' (#116) from zhangwei into dev weiz 2023-10-18 16:53:11 +08:00
16fc88fb9b update unknown 2023-10-18 16:52:41 +08:00
f75900d0b8 add:任务10提交接口，新增说明字段 chenbo 2023-10-18 16:30:33 +08:00
7601aca958 add:任务10结算分润 chenbo 2023-10-18 15:49:14 +08:00
674c057b1f Merge pull request '后台车辆租赁合同详情修复' (#115) from zhangwei into dev weiz 2023-10-18 15:41:54 +08:00
37dabba9a1 后台车辆租赁合同详情修复 unknown 2023-10-18 15:41:28 +08:00
6b246e6838 Merge pull request 'update' (#114) from zhangwei into dev weiz 2023-10-18 15:19:05 +08:00
6e90abe2b3 update unknown 2023-10-18 15:18:21 +08:00
0a7e3f6356 Merge pull request 'update' (#113) from zhangwei into dev weiz 2023-10-18 14:57:04 +08:00
4ee45bdf08 update unknown 2023-10-18 14:56:43 +08:00
d615e50733 Merge pull request 'update' (#112) from zhangwei into dev weiz 2023-10-18 14:42:11 +08:00
00dc9c1c0a update unknown 2023-10-18 14:41:46 +08:00
7acd784349 Merge pull request 'update' (#111) from zhangwei into dev weiz 2023-10-18 14:06:21 +08:00
32d0c15469 update unknown 2023-10-18 14:03:43 +08:00
364ad31f15 Merge pull request 'update' (#110) from zhangwei into dev weiz 2023-10-18 12:01:36 +08:00
c3546dd83e update unknown 2023-10-18 12:01:16 +08:00
b34eec7c68 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-18 11:17:13 +08:00
fe312ed117 add:任务10提交接口 chenbo 2023-10-18 11:17:03 +08:00
ecfaf3c1bf Merge pull request 'update' (#109) from zhangwei into dev weiz 2023-10-18 11:16:44 +08:00
29d0715d80 update unknown 2023-10-18 11:16:12 +08:00
f68298958c Merge pull request 'update' (#108) from zhangwei into dev weiz 2023-10-18 10:52:04 +08:00
cee7b56ab0 update unknown 2023-10-18 10:51:46 +08:00
aa0e5c9ae6 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-18 10:43:07 +08:00
cb6c7730a8 add:任务10的前台逻辑 chenbo 2023-10-18 10:42:58 +08:00
7f5a326a85 Merge pull request 'update' (#107) from zhangwei into dev weiz 2023-10-18 10:38:49 +08:00
20555862b6 update unknown 2023-10-18 10:38:19 +08:00
b08274f2f7 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-18 10:32:00 +08:00
74ff44a8ad add:前端代码更新 chenbo 2023-10-18 10:31:50 +08:00
84c1407168 Merge pull request 'master-yajin-feature' (#106) from master-yajin-feature into master chenbo 2023-10-18 10:27:31 +08:00
fb027ce16f Merge remote-tracking branch 'origin/master-yajin-feature' into master-yajin-feature master-yajin-feature chenbo 2023-10-18 10:26:47 +08:00
52b4ea0d4d 被冲掉代码 chenbo 2023-10-18 10:26:34 +08:00
68e261ea0b Merge pull request 'master-yajin-feature' (#105) from master-yajin-feature into master chenbo 2023-10-18 10:17:14 +08:00
c1908d8178 Merge pull request '修复租赁详情页bug' (#104) from zhangwei into dev weiz 2023-10-18 10:16:47 +08:00
1f468b61d2 修复租赁详情页bug unknown 2023-10-18 10:16:16 +08:00
02480accf4 Merge branch 'master' into master-yajin-feature chenbo 2023-10-18 10:16:07 +08:00
a028545068 前端代码 chenbo 2023-10-18 10:15:30 +08:00
a3d4ba5251 Merge pull request 'master-yajin-feature' (#102) from master-yajin-feature into master chenbo 2023-10-18 10:03:41 +08:00
fa242a8492 Merge branch 'master' into master-yajin-feature chenbo 2023-10-18 10:02:11 +08:00
0270ac8f9d revert f37e5b3ec29b10e910f19ac78e858efe57d4cf85 chenbo 2023-10-18 09:59:48 +08:00
108a8f36f2 Merge pull request '合同详情中租赁车俩签约时间显示错误修复' (#100) from zhangwei into dev weiz 2023-10-18 09:43:45 +08:00
f1a6d17923 合同详情中租赁车俩签约时间显示错误修复 unknown 2023-10-18 09:43:18 +08:00
c31b4ad335 Merge pull request '修复购买合同车辆数量异常' (#99) from zhangwei into dev weiz 2023-10-18 09:37:49 +08:00
414f6435ca 修复购买合同车辆数量异常 unknown 2023-10-18 09:37:11 +08:00
f37e5b3ec2 押金充值对公账号转账临时方案-前端代码 chenbo 2023-10-18 09:05:37 +08:00
45624625f4 Merge pull request 'fixed' (#98) from zhangwei into dev weiz 2023-10-17 19:38:35 +08:00
217c0166cd fixed unknown 2023-10-17 19:38:14 +08:00
9fb8a0e279 Merge pull request 'fixed' (#97) from zhangwei into dev weiz 2023-10-17 19:24:24 +08:00
b580c85738 fixed unknown 2023-10-17 19:24:01 +08:00