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

pjb

昨天 9ea93abc2606948e5724316a4a3ec338ea14a130

 src/main/java/com/zy/asrs/entity/PlaLog.java

@@ -236,6 +236,10 @@
    @TableField("memo")
    private String memo;

    @TableField("lactide_content")
    @ExcelProperty(value = "丙交酯含量,%")
    private Double lactideContent;

    public String getPakinTime$() {
        if (Cools.isEmpty(this.pakinTime)){
            return "";