2 Комити 2f04657673 ... 9e3097fbd5

Аутор SHA1 Порука Датум
  zhuangdezheng 9e3097fbd5 Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_production_api пре 1 година
  zhuangdezheng a43fff66ff 修改Excel导出 пре 1 година

+ 2 - 2
src/main/java/cn/ezhizao/framework/web/domain/BaseEntity.java

@@ -40,7 +40,7 @@ public class BaseEntity implements Serializable
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value="create_time",fill= FieldFill.INSERT)
-    @Excel(name = "发单日期", width = 30, dateFormat = "yyyy-MM-dd",sort = 6)
+    //@Excel(name = "发单日期", width = 30, dateFormat = "yyyy-MM-dd",sort = 6)
     private Date createTime;
 
     /** 更新者 */
@@ -71,7 +71,7 @@ public class BaseEntity implements Serializable
     private Date updateTime;
 
     /** 备注 */
-    @Excel(name = "备注")
+    // @Excel(name = "备注")
     private String remark;
 
     /** 请求参数 */

+ 1 - 0
src/main/java/cn/ezhizao/project/business/domain/BizProductionPlanDetail.java

@@ -322,6 +322,7 @@ public class BizProductionPlanDetail extends BaseEntity
     private List<BizDaywork> dayWorkList;
 
     /** 当前部门 */
+    @TableField(exist = false)
     private String currentDepartment;
     /** 待投产批数 */
     @TableField(exist = false)