Merge remote-tracking branch 'origin/master'

rain

2026-01-22 2636fff845e9460ca35abb20e7a22d34fb4f39a3

Merge remote-tracking branch 'origin/master'

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java

@@ -34,7 +34,7 @@
 */
@Data
@TableName("ja_gd_manage_device")
@ApiModel(value = "设备信息", description = "设备信息")
@ApiModel(value = "设备信息表", description = "设备信息")
@EqualsAndHashCode(callSuper = true)
public class GdManageDeviceEntity extends BaseEntity {


 drone-service/drone-system/Dockerfile

@@ -5,7 +5,7 @@
#启动自行加载
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone

COPY target/drone-system.jar /app.jar
EXPOSE 8106
COPY target/drone-system.jar /drone-system.jar
EXPOSE 8116

ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8  -Djava.security.egd=file:/dev/./urandom -jar -Xms1024m -Xmx1024m /app.jar"]
ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8  -Djava.security.egd=file:/dev/./urandom -jar -Xms1024m -Xmx1024m /drone-system.jar"]