Merge remote-tracking branch 'origin/hy-tobacco' into hy-tobacco

src/main/java/com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java

@@ -517,7 +517,7 @@ public class DataEnterCtrl {
                                ExcelObj obj, boolean hasSameTerm, List<String> data) {
         for (TaskIndValue value : values) {
             if (indicator.getIndId().equals(value.getIndId()) &&
-                    obj.getObjType().equals(value.getObjType())&&
+//                    obj.getObjType().equals(value.getObjType())&&
                     obj.getObjId().equals(value.getObjId())) {
                 if (StringUtils.isNotBlank(value.getIndValue())) {
                     data.add(value.getIndValue());