 sxu
|
9d68eeacfc
|
增加配置属性
|
2024-12-11 12:56:38 +08:00 |
|
sxu
|
954da9f9b7
|
增加配置属性
|
2024-12-11 12:13:04 +08:00 |
|
sxu
|
fda3089c7e
|
根据类型加载属性
|
2024-12-10 18:34:52 +08:00 |
|
sxu
|
0c4d7efde2
|
增加配置属性
|
2024-12-10 16:49:15 +08:00 |
 liang.chao
|
1eee9bfe05
|
更新时间字段更新
|
2024-12-10 15:58:10 +08:00 |
|
liang.chao
|
7fb5fc3d53
|
Merge remote-tracking branch 'origin/master'
|
2024-12-10 13:39:29 +08:00 |
|
liang.chao
|
3a0016321e
|
安全证书
|
2024-12-10 13:39:23 +08:00 |
|
sxu
|
02ba8fc45b
|
增加配置属性
|
2024-12-10 12:07:06 +08:00 |
|
sxu
|
16e25da984
|
增加配置属性
|
2024-12-10 11:13:35 +08:00 |
|
sxu
|
9dc5902df3
|
增加配置属性
|
2024-12-10 10:53:48 +08:00 |
|
sxu
|
7bca69e746
|
增加配置属性
|
2024-12-10 10:46:36 +08:00 |
|
sxu
|
7849348924
|
增加配置属性
|
2024-12-10 10:07:51 +08:00 |
|
liang.chao
|
c58aa96c9f
|
装备质检接口开发，联调
|
2024-12-09 17:45:05 +08:00 |
|
liang.chao
|
70df292288
|
订单、装备数据隔离
|
2024-12-06 20:40:21 +08:00 |
|
liang.chao
|
3851cfc92b
|
设备列表同公司数据隔离
|
2024-12-06 18:55:00 +08:00 |
 mashuai
|
33b7aa480d
|
优化
|
2024-12-06 18:25:13 +08:00 |
|
mashuai
|
e1bd7a2e14
|
优化
|
2024-12-06 17:58:35 +08:00 |
|
mashuai
|
333edc69ab
|
优化
|
2024-12-06 17:50:01 +08:00 |
|
mashuai
|
37fe84c944
|
优化
|
2024-12-06 17:27:27 +08:00 |
|
mashuai
|
3856318dc5
|
优化
|
2024-12-06 17:22:03 +08:00 |
|
liang.chao
|
5cb179f17c
|
设备不需要根据manageType判断了
|
2024-12-06 16:12:20 +08:00 |
|
liang.chao
|
6b0b81af0d
|
订单状态修改，批量新增修改
|
2024-12-06 15:17:27 +08:00 |
|
liang.chao
|
1e0f75f42b
|
订单状态修改，批量新增修改
|
2024-12-06 15:01:32 +08:00 |
|
mashuai
|
a5d0b758c7
|
结算优化
|
2024-12-06 14:12:02 +08:00 |
|
mashuai
|
365036ca50
|
结算改价
|
2024-12-05 18:12:21 +08:00 |
|
mashuai
|
fb18a63163
|
结算改价
|
2024-12-05 17:13:41 +08:00 |
|
liang.chao
|
a12636fe37
|
增加校验日期，校验周期
|
2024-12-05 16:24:47 +08:00 |
|
mashuai
|
1fe09a7839
|
结算
|
2024-12-05 15:50:21 +08:00 |
|
mashuai
|
00354bffed
|
需求发布
|
2024-12-05 11:29:06 +08:00 |
|
liang.chao
|
f9797ff89b
|
日期格式校验修改
|
2024-12-05 11:10:48 +08:00 |
|
liang.chao
|
bb51e50555
|
设备取消，增加库存 改状态
|
2024-12-05 10:29:45 +08:00 |
|
mashuai
|
669ae27f9a
|
退租检修
|
2024-12-04 17:20:58 +08:00 |
|
liang.chao
|
c94f3d2d0a
|
装备批量导入，导入模版下载，安全证书功能
|
2024-12-04 17:19:41 +08:00 |
|
mashuai
|
557aae7778
|
bug优化
|
2024-12-04 11:27:05 +08:00 |
|
liang.chao
|
d509a8d31e
|
Merge remote-tracking branch 'origin/master'
|
2024-12-04 10:58:47 +08:00 |
|
liang.chao
|
1cbe46ab23
|
新增装备增加校验日期 校验周期
|
2024-12-04 10:58:42 +08:00 |
|
mashuai
|
3c33812401
|
bug优化
|
2024-12-04 10:50:10 +08:00 |
|
liang.chao
|
d6c57e633a
|
装备所属公司新增
|
2024-12-04 09:50:01 +08:00 |
|
liang.chao
|
0787dfbaba
|
装备编码可重复，编码装备退租后先下架
|
2024-12-04 09:30:43 +08:00 |
|
liang.chao
|
bd0f6df8fe
|
代码优化
|
2024-12-04 09:07:23 +08:00 |
|
mashuai
|
c94a0aba93
|
Merge remote-tracking branch 'origin/master'
|
2024-12-03 19:28:00 +08:00 |
|
mashuai
|
baa4b9b859
|
bug优化
|
2024-12-03 19:27:55 +08:00 |
|
liang.chao
|
2ea021b937
|
代码优化
|
2024-12-03 18:54:04 +08:00 |
|
liang.chao
|
a36a1f2087
|
代码优化
|
2024-12-03 18:53:09 +08:00 |
|
liang.chao
|
c54c474627
|
装备设备库存修改（批量），增加驳回人驳回时间
|
2024-12-03 17:36:10 +08:00 |
|
liang.chao
|
1726130093
|
Merge remote-tracking branch 'origin/master'
|
2024-12-03 16:41:21 +08:00 |
|
liang.chao
|
b16cb9f59b
|
装备新增必填项去掉
|
2024-12-03 16:41:08 +08:00 |
|
mashuai
|
352ec3c2fb
|
bug优化
|
2024-12-03 16:23:11 +08:00 |
|
liang.chao
|
c5cc430b1e
|
系统问题解决
|
2024-12-03 16:01:06 +08:00 |
|
liang.chao
|
3d62104bc7
|
租赁单价从类型树中获取
|
2024-12-03 15:01:05 +08:00 |
|
liang.chao
|
f35e16dd70
|
装备管理新增修改逻辑优化
|
2024-12-03 14:00:12 +08:00 |
|
liang.chao
|
58ed988693
|
装备重量设置不为必填
|
2024-12-03 11:26:15 +08:00 |
|
liang.chao
|
351f6b0154
|
草稿状态下存储上传人和设备编码
|
2024-12-03 11:15:53 +08:00 |
|
liang.chao
|
fde308872d
|
租金从ma_type中获取
|
2024-12-03 10:52:24 +08:00 |
|
liang.chao
|
edf110d40a
|
承租方所属公司优化
|
2024-12-03 10:29:01 +08:00 |
|
liang.chao
|
22ec5ea7f5
|
订单根据时间排序
|
2024-12-02 17:48:59 +08:00 |
|
mashuai
|
c1447c721a
|
地市增加
|
2024-12-02 17:38:23 +08:00 |
|
mashuai
|
0e4e978020
|
接口联调优化
|
2024-12-02 17:13:30 +08:00 |
|
mashuai
|
39b2bc8eff
|
Merge remote-tracking branch 'origin/master'
|
2024-12-02 15:33:47 +08:00 |
|
mashuai
|
6ea1687cde
|
接口联调优化
|
2024-12-02 15:33:43 +08:00 |
|
liang.chao
|
205bfcfe6d
|
提示更新
|
2024-12-02 15:33:38 +08:00 |
|
mashuai
|
16aa4dedd8
|
接口联调优化
|
2024-12-02 11:15:28 +08:00 |
|
liang.chao
|
ebf09c985f
|
去除已删除字段
|
2024-12-02 10:09:17 +08:00 |
|
liang.chao
|
e5150f75eb
|
订单承租人个出租方数据隔离
|
2024-12-02 09:45:21 +08:00 |
|
liang.chao
|
c0e662807e
|
订单承租人个出租方数据隔离
|
2024-12-02 09:02:59 +08:00 |
|
liang.chao
|
7f3b989b56
|
订单承租人个出租方数据隔离
|
2024-12-01 19:17:11 +08:00 |
|
liang.chao
|
bd97f4a286
|
订单时间区间查询修改
|
2024-12-01 17:54:33 +08:00 |
|
liang.chao
|
b70bc3cddc
|
订单数据修改
|
2024-12-01 17:12:42 +08:00 |
|
liang.chao
|
fc30422185
|
设备库存处理和装备code改成自动生成
|
2024-12-01 16:39:52 +08:00 |
|
mashuai
|
d60dba621b
|
接口联调优化
|
2024-12-01 16:26:11 +08:00 |
|
liang.chao
|
77e577c22d
|
订单和商品数据隔离查询
|
2024-12-01 15:12:50 +08:00 |
|
mashuai
|
883601d520
|
Merge remote-tracking branch 'origin/master'
|
2024-12-01 13:30:18 +08:00 |
|
mashuai
|
6587008d07
|
接口联调
|
2024-12-01 13:30:13 +08:00 |
|
liang.chao
|
4029e29e2d
|
订单状态统一修改
|
2024-12-01 13:23:19 +08:00 |
|
liang.chao
|
092cdeb03c
|
订单状态统一修改
|
2024-12-01 12:52:51 +08:00 |
|
liang.chao
|
6c76126020
|
订单状态统一修改
|
2024-12-01 12:52:37 +08:00 |
|
liang.chao
|
bec91aac8a
|
订单状态统一修改
|
2024-12-01 12:41:36 +08:00 |
|
liang.chao
|
7d4bc94b35
|
订单状态统一修改
|
2024-12-01 12:34:31 +08:00 |
|
liang.chao
|
cccf463b36
|
订单状态统一修改
|
2024-12-01 12:31:25 +08:00 |
|
liang.chao
|
c0960719db
|
订单状态统一修改
|
2024-12-01 12:28:14 +08:00 |
|
liang.chao
|
586aa21b41
|
订单状态统一修改
|
2024-12-01 12:01:48 +08:00 |
|
liang.chao
|
65ad64a465
|
订单状态统一修改
|
2024-12-01 11:49:59 +08:00 |
|
liang.chao
|
5ec647ac8a
|
库存修改
|
2024-11-29 18:07:06 +08:00 |
|
liang.chao
|
3c6c69d31c
|
Merge remote-tracking branch 'origin/master'
|
2024-11-29 10:41:16 +08:00 |
|
liang.chao
|
f9e9dd3286
|
分页bug修改
|
2024-11-29 10:41:05 +08:00 |
|
mashuai
|
ef367f4d2c
|
接口联调
|
2024-11-28 18:54:31 +08:00 |
|
mashuai
|
2738a8912d
|
接口联调
|
2024-11-28 18:17:12 +08:00 |
syruan
|
356bf9b5e9
|
字段格式化取消
|
2024-11-28 17:51:07 +08:00 |
|
liang.chao
|
791257c768
|
订单详情时间类型修改
|
2024-11-28 17:06:17 +08:00 |
|
liang.chao
|
8f527398ba
|
订单状态流转代码提交
|
2024-11-28 16:18:34 +08:00 |
|
liang.chao
|
6915a269d0
|
Merge remote-tracking branch 'origin/master'
|
2024-11-28 16:06:47 +08:00 |
|
liang.chao
|
7e39dbd592
|
订单状态流转代码提交
|
2024-11-28 16:06:43 +08:00 |
|
mashuai
|
d674b880e7
|
租赁需求大厅
|
2024-11-28 15:53:12 +08:00 |
|
liang.chao
|
108adcd1b8
|
订单状态流转代码提交
|
2024-11-28 15:21:48 +08:00 |
|
liang.chao
|
d6cab8ecd7
|
订单状态流转代码提交
|
2024-11-28 15:12:24 +08:00 |
|
liang.chao
|
c9bf3a817c
|
订单状态流转代码提交
|
2024-11-28 13:33:51 +08:00 |
|
liang.chao
|
d23d2c74e7
|
订单状态流转代码提交
|
2024-11-28 11:24:03 +08:00 |
|
liang.chao
|
e16dcb5eaa
|
Merge remote-tracking branch 'origin/master'
|
2024-11-28 11:06:56 +08:00 |
|
liang.chao
|
f1f39cfa56
|
逻辑修改
|
2024-11-28 11:06:51 +08:00 |
 15856
|
d4d99c5c94
|
优化购物车展示
|
2024-11-28 10:48:24 +08:00 |
|
liang.chao
|
0cbe4c46ba
|
订单外层状态修改
|
2024-11-28 10:45:39 +08:00 |
|
liang.chao
|
f981612884
|
字段修改
|
2024-11-28 10:09:00 +08:00 |
|
mashuai
|
1a69288d3b
|
租赁需求大厅
|
2024-11-27 18:20:32 +08:00 |
|
liang.chao
|
2133159088
|
Merge remote-tracking branch 'origin/master'
|
2024-11-27 17:47:24 +08:00 |
|
liang.chao
|
5e5967baad
|
商品上下架和删除bug修改
|
2024-11-27 17:47:20 +08:00 |
|
mashuai
|
0e344682ec
|
租赁需求大厅
|
2024-11-27 17:29:15 +08:00 |
|
sxu
|
f52fae9613
|
类型管理
|
2024-11-27 17:12:07 +08:00 |
|
sxu
|
73463689be
|
Merge remote-tracking branch 'origin/master'
|
2024-11-27 17:04:47 +08:00 |
|
sxu
|
aa1eed41d9
|
类型管理
|
2024-11-27 17:03:03 +08:00 |
|
sxu
|
23a4edc63f
|
类型管理
|
2024-11-27 16:50:21 +08:00 |
|
liang.chao
|
5637f67208
|
订单查询接口代码提交
|
2024-11-27 15:13:29 +08:00 |
|
liang.chao
|
82a3e6b8c6
|
订单查询接口代码提交
|
2024-11-27 14:41:09 +08:00 |
|
liang.chao
|
5860a91201
|
订单查询接口代码提交
|
2024-11-27 14:39:58 +08:00 |
|
liang.chao
|
d2a0936633
|
订单查询接口代码提交
|
2024-11-27 14:11:34 +08:00 |
|
liang.chao
|
950d1bc3e9
|
订单查询接口代码提交
|
2024-11-27 11:27:40 +08:00 |
|
liang.chao
|
2af1f91199
|
订单查询接口代码提交
|
2024-11-27 10:45:22 +08:00 |
|
liang.chao
|
b0cef39f42
|
订单查询接口代码提交
|
2024-11-27 10:41:27 +08:00 |
|
liang.chao
|
c6a25b49ca
|
订单查询接口代码提交
|
2024-11-27 10:38:32 +08:00 |
|
liang.chao
|
b176256ed3
|
订单查询接口代码提交
|
2024-11-27 10:06:53 +08:00 |
|
15856
|
aa464f1a45
|
加入购物车以及详情展示优化
|
2024-11-26 18:55:15 +08:00 |
|
mashuai
|
a7feb390c8
|
bug
|
2024-11-26 18:08:43 +08:00 |
|
mashuai
|
1972ee4afd
|
Merge remote-tracking branch 'origin/master'
|
2024-11-26 17:52:45 +08:00 |
|
liang.chao
|
6432a0c004
|
购物车提交和订单查询接口
|
2024-11-26 17:52:44 +08:00 |
|
mashuai
|
5710939573
|
优化
|
2024-11-26 17:52:41 +08:00 |
|
mashuai
|
62c81d8fa0
|
优化
|
2024-11-26 16:52:35 +08:00 |
|
mashuai
|
2bd1fbf4e5
|
优化
|
2024-11-26 16:18:57 +08:00 |
|
15856
|
e1da9881c8
|
热搜装备新增公司id
|
2024-11-26 15:29:06 +08:00 |
|
mashuai
|
8099c6ada3
|
详情
|
2024-11-26 13:45:04 +08:00 |
|
mashuai
|
743cc1f17b
|
Merge remote-tracking branch 'origin/master'
|
2024-11-26 13:41:05 +08:00 |
|
mashuai
|
92cae12061
|
详情
|
2024-11-26 13:41:00 +08:00 |
|
15856
|
2b752442f3
|
立即承租
|
2024-11-26 13:27:23 +08:00 |
|
15856
|
32e17988ae
|
立即承租
|
2024-11-26 11:27:44 +08:00 |
|
15856
|
c862054a42
|
Merge remote-tracking branch 'origin/master'
|
2024-11-26 11:16:18 +08:00 |
|
mashuai
|
6eea48f7a9
|
Merge remote-tracking branch 'origin/master'
|
2024-11-26 11:16:01 +08:00 |
|
15856
|
eb96ef8093
|
立即承租
|
2024-11-26 11:15:54 +08:00 |
|
mashuai
|
4f25add46b
|
优化
|
2024-11-26 11:15:51 +08:00 |
|
syruan
|
5f7f5c707b
|
增加注释
|
2024-11-26 11:07:09 +08:00 |
|
mashuai
|
01de2f4cbc
|
删除预约车
|
2024-11-26 10:59:41 +08:00 |
|
mashuai
|
7484683d3a
|
装备共享大厅联调
|
2024-11-26 10:25:17 +08:00 |
|
syruan
|
8002f8143f
|
物资装备SQL修改
|
2024-11-26 09:48:08 +08:00 |
|
syruan
|
0928f68f6a
|
物资装备SQL修改
|
2024-11-26 09:06:39 +08:00 |
|
syruan
|
aa3278f2ca
|
物资装备条件筛选、装备上下架逻辑、草稿状态定义
|
2024-11-25 17:43:14 +08:00 |
|
mashuai
|
9409c65920
|
装备共享大厅联调
|
2024-11-25 16:26:46 +08:00 |
|
mashuai
|
7df56e43cc
|
装备共享大厅
|
2024-11-25 14:46:39 +08:00 |
|
liang.chao
|
baf144e412
|
设备上下架功能
|
2024-11-23 17:43:19 +08:00 |
|
mashuai
|
16c608f99e
|
添加预约车功能及列表查询
|
2024-11-23 17:15:01 +08:00 |
|
syruan
|
8555949ed7
|
物资装备代码合并
|
2024-11-23 15:36:02 +08:00 |
|
mashuai
|
2be1e0098d
|
首页装备搜索
|
2024-11-23 14:43:08 +08:00 |
|
liang.chao
|
11c9f3a423
|
冲突还原
|
2024-11-23 13:30:20 +08:00 |
|
liang.chao
|
8997b8df54
|
Merge remote-tracking branch 'origin/master'
|
2024-11-23 13:27:26 +08:00 |
|
liang.chao
|
88b969449c
|
设备管理代码修改
|
2024-11-23 13:26:26 +08:00 |
|
mashuai
|
61142f74bd
|
首页装备搜索
|
2024-11-23 12:49:14 +08:00 |
|
liang.chao
|
f42484d685
|
代码还原
|
2024-11-23 11:44:49 +08:00 |
|
liang.chao
|
4576c616d6
|
设备新增修改
|
2024-11-23 11:42:53 +08:00 |
|
liang.chao
|
ca2f94b2c7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
|
2024-11-23 11:41:06 +08:00 |
|
liang.chao
|
d04607ff31
|
设备新增修改
|
2024-11-23 11:40:06 +08:00 |
|
sxu
|
1e8b609d9b
|
add repeat annotation
|
2024-11-22 19:37:48 +08:00 |
|
mashuai
|
8396aaa448
|
最新装备
|
2024-11-22 18:03:53 +08:00 |
|
liang.chao
|
bca4e13ada
|
Merge remote-tracking branch 'origin/master'
|
2024-11-22 17:41:35 +08:00 |
|
liang.chao
|
3069840dd5
|
预约车功能开发
|
2024-11-22 17:41:27 +08:00 |
|
mashuai
|
08ba98d4f6
|
热搜装备
|
2024-11-22 17:41:13 +08:00 |
|
syruan
|
4a3009366d
|
物资类型提取，控制器修改
|
2024-11-22 13:47:36 +08:00 |
|
mashuai
|
37ac0556e8
|
首页类目搜索
|
2024-11-22 13:04:43 +08:00 |
|
syruan
|
f83de238b6
|
设备信息，字典domain
|
2024-11-22 11:12:06 +08:00 |
|
sxu
|
0079778d3a
|
Merge remote-tracking branch 'origin/master'
|
2024-11-22 10:37:06 +08:00 |
|
syruan
|
5d7d542b9c
|
设备信息，字典domain
|
2024-11-22 10:16:54 +08:00 |
|
mashuai
|
55fe18c5f2
|
配置文件
|
2024-11-22 09:39:07 +08:00 |
|
sxu
|
aaef3af05b
|
add profile
|
2024-11-22 08:19:39 +08:00 |
|
sxu
|
1652eac0c5
|
first commit
|
2024-11-20 19:03:03 +08:00 |