Merge remote-tracking branch 'origin/release20201022' into release20201022
This commit is contained in:
commit
0b4611283e
@ -31,7 +31,12 @@
|
||||
String EXPCOMPANY = rs.getString("EXPCOMPANY");
|
||||
String EXPSTRATDATE = rs.getString("EXPSTRATDATE");
|
||||
String EXPENDDATE = rs.getString("EXPENDDATE");
|
||||
|
||||
if(null == EXPSTRATDATE || "null".equals(EXPSTRATDATE.toLowerCase())){
|
||||
EXPSTRATDATE = "";
|
||||
}
|
||||
if(null == EXPENDDATE || "null".equals(EXPENDDATE.toLowerCase())){
|
||||
EXPENDDATE = "";
|
||||
}
|
||||
String sButtons[][] = {
|
||||
{"true","All","Button","保存","保存所有修改","recordsave()","","","",""},
|
||||
{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user