Block a user
6e1cf8aafb
Merge branch 'master' into dev_fire
f903e2f3e2
补充缺少的注解
53b6898daa
Merge branch 'master' of http://118.24.27.47:1024/Mr.Song/SmartUrbanRural
53fef37cee
修改两个不能运行的bug
2114d28b0b
Default Changelist
liuchengqian
deleted branch develop_old from liuchengqian/industrial_measurement
2022-03-03 15:45:24 +08:00
liuchengqian
deleted branch develop from liuchengqian/industrial_measurement
2022-03-03 15:45:06 +08:00
liuchengqian
deleted branch temp1 from liuchengqian/industrial_measurement
2022-03-03 15:44:49 +08:00
11656812b2
Merge branch 'develop_old' into temp1
3678e13693
修改文件接收方式
24e6545e01
修改图片路径
641cfceb9f
修改图片路径
fd01a3a3d6
修改Controller
2f3a995359
修改Qo
ed25c2b5fb
修改entity,partNo-->machineTypeNo,添加craftItemName
2a362c3264
完善文件服务器传输
62703e1fe4
更新动态多条件查询
266c46fe16
更新参数类型
b0afd5f4aa
更新参数类型
5ef4df2d6f
更新dao返回值类型