You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
xs f4eb21a6c4 Merge remote-tracking branch 'origin/breach-zhy'
# Conflicts:
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutConfigController.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutDescController.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutConfig.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutDesc.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutConfigDao.java
#	ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutDescDao.java
#	ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutConfigDao.xml
#	ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutDescDao.xml
#	ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDevice.java
#	ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwElectronicFence.java
#	ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
#	ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml
#	ruoyi-ui/vue.config.js
1 year ago
..
hw-basic 页面布局配置功能接口 1 year ago
hw-business Merge remote-tracking branch 'origin/breach-zhy' 1 year ago
hw-data-process 设备数据上传服务记录时间ts修改成设备上传数据的时间 1 year ago
hw-mqtt-broker change - 短信推送报警信息 1 year ago
hw-portal 3.0 1 year ago
hw-tdengine TD服务bug修改,新增根据设备获取坐标接口 1 year ago
hw-websocket-server change - 短信推送报警信息 1 year ago
ruoyi-file 设备数据上传服务记录时间ts修改成设备上传数据的时间 1 year ago
ruoyi-gen change - 短信推送报警信息 1 year ago
ruoyi-job change - 短信推送报警信息 1 year ago
ruoyi-system 导出sheet名修改,三级页面历史记录得参数单位添加 1 year ago
pom.xml 3.0 1 year ago