Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

2 天以前 7193fdcb256c3836393bff9c3ab0efe4fa56a3c0

Merge remote-tracking branch 'origin/dev_New' into dev_New

 src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java

@@ -25,7 +25,7 @@
 */
@RestController
@Api(tags = "计量器具台账记录")
@RequestMapping("/measuringInstrumentLedgerRecord")
@RequestMapping("Record")
public class MeasuringInstrumentLedgerRecordController extends BaseController {

    @Autowired

 src/main/resources/mapper/quality/QualityTestStandardMapper.xml

@@ -13,10 +13,10 @@
        <if test="c.standardName != null and c.standardName != '' ">
            AND standard_name like concat('%',#{c.standardName},'%')
        </if>
        <if test="c.state != null and c.state != '' ">
        <if test="c.state != null ">
            AND state =#{c.state}
        </if>
        <if test="c.inspectType != null and c.inspectType != '' ">
        <if test="c.inspectType != null ">
            AND inspect_type =#{c.inspectType}
        </if>
    </select>