lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java
@@ -468,7 +468,7 @@ private String remark; //扭矩值 private float torqueValue; private float torque; //进给参数 private String feedParameter; @@ -996,12 +996,12 @@ this.remark = remark; } public float getTorqueValue() { return torqueValue; public float getTorque() { return torque; } public void setTorqueValue(float torqueValue) { this.torqueValue = torqueValue; public void setTorque(float torqueValue) { this.torque = torqueValue; } public String getFeedParameter() { lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
@@ -40,7 +40,7 @@ <select id="getWorkLineList" resultType="org.jeecg.modules.mdc.dto.EquipmentMachingDto"> SELECT torque_date CollectTime, torque_value, torque_value torque, feed_parameter FROM mdc_torque_config
