Merge branch 'hylee'
This commit is contained in:
commit
09e9d2421d
@ -23,8 +23,7 @@ public enum UserEnum {
|
||||
,user16("&@~7mpJXFU+euFUNEdHmHLQVQ==","정수빈", "대리")
|
||||
,user17("&@~+BL2FKvmIQc/jIyHvz0jew==","박은지", "주임")
|
||||
|
||||
,user18("&@~/GE8OIrOSbOevc+sViEvbg==","이수현R", "알바")
|
||||
,user19("&@~l+Zs/I7piSIFu9WBQaI1eg==","임선율R", "알바")
|
||||
,user18("&@~l+Zs/I7piSIFu9WBQaI1eg==","박세희R", "알바")
|
||||
|
||||
,user99("&@~6MWcZ9FnikUCQ8NTFDqHHQ==","itn6", "")
|
||||
// ,user19("&@~8v+/5tt7+aiF/GuAhT37Xw==","S고수빈")
|
||||
@ -34,6 +33,9 @@ public enum UserEnum {
|
||||
// ,user23("&@~1M3p31Kvc+zVi2IMgvazHw==","S한승아")
|
||||
// ,user24("&@~/GE8OIrOSbOevc+sViEvbg==","S장수진")
|
||||
// ,user14("&@~HM2dbaHcmk8bIMYKO2uIRg==","장건영")
|
||||
|
||||
// ,user18("&@~/GE8OIrOSbOevc+sViEvbg==","이수현R", "알바")
|
||||
// ,user19("&@~l+Zs/I7piSIFu9WBQaI1eg==","임선율R", "알바")
|
||||
;
|
||||
|
||||
private final String label;
|
||||
|
||||
@ -99,7 +99,8 @@ function fn_oneInsertCntAndTime(){
|
||||
}
|
||||
},
|
||||
error: function (e) {
|
||||
alert("조회에 실패하였습니다.");
|
||||
alert(" findByInsertCnt 조회에 실패하였습니다.");
|
||||
oneStopInsertTimer();
|
||||
console.log("ERROR : " + JSON.stringify(e));
|
||||
},
|
||||
beforeSend : function(xmlHttpRequest) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user