 sxu
|
f7bc5de8a2
|
fix conflict
|
2024-09-17 17:34:30 +08:00 |
 liang.chao
|
ef69a84117
|
nginx脚本提交
|
2024-09-14 14:09:49 +08:00 |
|
liang.chao
|
1a18962c28
|
数量字段统一提交
|
2024-09-13 17:20:46 +08:00 |
|
liang.chao
|
171bf24536
|
Merge remote-tracking branch 'origin/master'
|
2024-09-12 11:29:54 +08:00 |
 15856
|
816c00dabd
|
配置修改
|
2024-09-12 11:28:22 +08:00 |
|
liang.chao
|
6f0d216a6e
|
生产bug和配置管理代码提交
|
2024-09-12 11:14:43 +08:00 |
|
liang.chao
|
76fd0dd25a
|
Merge remote-tracking branch 'origin/master'
|
2024-09-11 15:58:28 +08:00 |
|
liang.chao
|
f395024270
|
南网测试环境ip修改
|
2024-09-11 15:58:15 +08:00 |
|
sxu
|
1b8c7b0aa2
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/cqdevicemgt
|
2024-09-10 17:12:08 +08:00 |
|
sxu
|
3efffcc71a
|
use config
|
2024-09-10 17:09:48 +08:00 |
 wcy
|
6436cc92fb
|
intelligentCode修改
|
2024-09-10 15:32:17 +08:00 |
|
wcy
|
b841fef417
|
intelligentCode修改
|
2024-09-10 14:46:42 +08:00 |
|
wcy
|
b60edf406d
|
Merge remote-tracking branch 'origin/master'
|
2024-09-10 14:45:42 +08:00 |
|
wcy
|
1aa233edc0
|
intelligentCode修改
|
2024-09-10 14:45:21 +08:00 |
|
15856
|
88722578f8
|
配置修改
|
2024-09-10 13:24:28 +08:00 |
|
wcy
|
dce67fc1f3
|
machineCode新增
|
2024-09-10 11:15:45 +08:00 |
|
wcy
|
21ba1683ae
|
machineCode新增
|
2024-09-10 11:15:20 +08:00 |
|
wcy
|
c2335ccf6f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
|
2024-09-10 11:13:36 +08:00 |
|
wcy
|
5fe548e1c8
|
machineCode新增
|
2024-09-10 11:12:02 +08:00 |
|
15856
|
821254a944
|
推送智慧工程代码完善
|
2024-09-10 10:17:35 +08:00 |
 mashuai
|
261980fc01
|
datetime
|
2024-09-10 09:19:01 +08:00 |
|
mashuai
|
5d783decb2
|
datetime
|
2024-09-09 10:11:47 +08:00 |
|
15856
|
be435a5b8f
|
sonaer异味修改
|
2024-09-09 09:25:17 +08:00 |
|
sxu
|
352291ba23
|
退料接收多类型机具时的问题优化
|
2024-09-08 13:27:36 +08:00 |
|
sxu
|
672ade2283
|
Merge branch 'master' into datetime0902
|
2024-09-07 09:16:42 +08:00 |
|
sxu
|
99fc70cf0c
|
Merge branch 'master' into typechange0901
|
2024-09-07 09:15:48 +08:00 |
|
liang.chao
|
a917964c96
|
代码中金额、数量类型修改
|
2024-09-06 17:31:54 +08:00 |
|
liang.chao
|
9c39f36d8e
|
代码中金额、数量类型修改
|
2024-09-06 13:46:06 +08:00 |
|
15856
|
ad6c3e64ea
|
接收从租赁推送过来的装备
|
2024-09-06 11:34:46 +08:00 |
|
mashuai
|
11eca5c209
|
datetime
|
2024-09-06 10:34:28 +08:00 |
|
liang.chao
|
5639054cfd
|
代码中金额、数量类型修改
|
2024-09-06 10:12:50 +08:00 |
|
liang.chao
|
d6888f6a97
|
代码中金额、数量类型修改
|
2024-09-05 18:22:29 +08:00 |
|
liang.chao
|
be630dae22
|
代码中金额、数量类型修改
|
2024-09-05 17:30:31 +08:00 |
|
15856
|
9af5335a71
|
获取管理员
|
2024-09-05 16:24:36 +08:00 |
|
sxu
|
e64ea2f2ca
|
推送业务
|
2024-09-04 17:25:57 +08:00 |
|
15856
|
9461d70325
|
Merge remote-tracking branch 'origin/master'
|
2024-09-04 09:39:47 +08:00 |
|
15856
|
495a07edde
|
获取管理员
|
2024-09-04 09:39:38 +08:00 |
|
sxu
|
ccf30659f4
|
推送地址
|
2024-09-04 09:37:11 +08:00 |
|
sxu
|
4120111a98
|
Merge remote-tracking branch 'origin/master'
|
2024-09-04 09:34:53 +08:00 |
|
sxu
|
112265865b
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/cqdevicemgt
|
2024-09-04 09:34:32 +08:00 |
|
sxu
|
868c9a5a8e
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/cqdevicemgt
# Conflicts:
# sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml
|
2024-09-04 09:21:40 +08:00 |
|
15856
|
245306c2e1
|
http请求优化
|
2024-09-04 09:20:41 +08:00 |
|
mashuai
|
9e0b96e482
|
datetime
|
2024-09-04 09:13:59 +08:00 |
|
sxu
|
8e02043b06
|
智慧工程
|
2024-09-03 19:08:32 +08:00 |
|
sxu
|
088fdd2ed1
|
智慧工程
|
2024-09-03 18:00:27 +08:00 |
|
sxu
|
5d4c26e516
|
智慧工程
|
2024-09-03 16:47:09 +08:00 |
|
sxu
|
1b76407711
|
智慧工程
|
2024-09-03 09:15:46 +08:00 |
|
liang.chao
|
8cbccd557a
|
代码中金额、数量类型修改
|
2024-09-02 17:48:26 +08:00 |
|
sxu
|
2a4a29826f
|
修复配置文件
|
2024-09-02 17:03:28 +08:00 |
|
sxu
|
dc5136bee4
|
推送装备
|
2024-09-02 16:49:36 +08:00 |